Merge pull request #20 from alturanft/unity_bugs

Releasing version 1.0.5
alturanft · Dec 23, 2022 · f5a9e98 · f5a9e98
2 parents ed0006d + 818fe46
commit f5a9e98
Show file tree

Hide file tree

Showing 25 changed files with 45 additions and 68 deletions.
diff --git a/Altura-Sample~/AlturaDemo.meta b/Altura-Sample~/AlturaDemo.meta
diff --git a/Altura-Sample~/AlturaDemo/Get User Information.unity b/Altura-Sample~/AlturaDemo/Get User Information.unity
@@ -158,10 +158,10 @@ RectTransform:
   m_Father: {fileID: 989618426}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 158.2, y: -203.5}
-  m_SizeDelta: {x: 193.09, y: 33.566}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -241.8, y: -11.5}
+  m_SizeDelta: {x: 193.08997, y: 33.56601}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &15798127
 MonoBehaviour:
@@ -678,9 +678,9 @@ RectTransform:
   m_Father: {fileID: 989618426}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 181.7, y: -439.4}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -197.03, y: -151.4}
   m_SizeDelta: {x: 294.0597, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &423096875
@@ -838,10 +838,10 @@ RectTransform:
   m_Father: {fileID: 989618426}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 209.99, y: -121.5}
-  m_SizeDelta: {x: 280.02, y: 22}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -190.01001, y: 99.399994}
+  m_SizeDelta: {x: 280.02002, y: 22}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &602855604
 MonoBehaviour:

diff --git a/Altura-Sample~/AlturaDemo/Transfer Item.unity b/Altura-Sample~/AlturaDemo/Transfer Item.unity
@@ -206,19 +206,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 15798128}
   m_OnClick:
     m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 1913506717}
-        m_TargetAssemblyTypeName: AlturaNFT.Samples.AlturaDemo.GetUserDetails, AlturaNFT.Samples.AlturaDemo
-        m_MethodName: TransferItem_Run
-        m_Mode: 1
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
+      m_Calls: []
 --- !u!114 &15798128
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1731,7 +1719,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 989618425}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
   m_Name: 

diff --git a/Editor/AlturaNFTSettings.cs b/Editor/AlturaNFTSettings.cs
@@ -3,6 +3,7 @@
 using UnityEditor;
 using Newtonsoft.Json; 
 using UnityEditor.PackageManager;
+using UnityEditor.VSAttribution.AlturaNFT.Editor;
 
 namespace AlturaNFT.Editor 
 {
@@ -278,7 +279,8 @@ private void OnDisable()
         public override void SaveChanges()
         {
             WriteToUserPrefs();
-            UserStats(); 
+            UserStats();
+            VSAttribution.SendAttributionEvent("SavingApiKey","AlturaNFT", myAPIString); 
         }
 
         static void ShowHomeWindow()

diff --git a/Editor/GetCollection_Editor.cs b/Editor/GetCollection_Editor.cs
@@ -19,7 +19,7 @@ public override void OnInspectorGUI()
             GUILayout.Box(banner);
             GUILayout.EndHorizontal();
 
-            if (GUILayout.Button("GET Contract/Collection Transactions", GUILayout.Height(45)))
+            if (GUILayout.Button("GET Collection", GUILayout.Height(45)))
             {
                 AlturaUser.SetFromEditorWin();
                 myScript.Run();

diff --git a/Runtime/VSAttribution.cs → Editor/VSAttribution.cs b/Runtime/VSAttribution.cs → Editor/VSAttribution.cs
@@ -1,7 +1,7 @@
 using System;
 using UnityEngine.Analytics;
 
-namespace UnityEditor.VSAttribution.AlturaNFT
+namespace UnityEditor.VSAttribution.AlturaNFT.Editor
 {
 	public static class VSAttribution
 	{

diff --git a/Runtime/VSAttribution.cs.meta → Editor/VSAttribution.cs.meta b/Runtime/VSAttribution.cs.meta → Editor/VSAttribution.cs.meta
diff --git a/Runtime/AuthenticateUser.cs b/Runtime/AuthenticateUser.cs
@@ -3,7 +3,6 @@
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.Networking;
-using UnityEditor.VSAttribution.AlturaNFT;
 namespace AlturaNFT  
 { using Internal;
 
@@ -133,8 +132,7 @@ IEnumerator CallAPIProcess()
             {
                 //Make request
                 UnityWebRequest request = UnityWebRequest.Get(WEB_URL);
-                request.SetRequestHeader("Content-Type", "application/json");
-                VSAttribution.SendAttributionEvent("Authenticate","AlturaNFT", _apiKey);                
+                request.SetRequestHeader("Content-Type", "application/json");         
             string url = "https://api.alturanft.com/api/sdk/unity/";
             WWWForm form = new WWWForm();
             UnityWebRequest www = UnityWebRequest.Post(url + "Authenticate" + "?apiKey=" + _apiKey, form);

diff --git a/Runtime/GetCollection.cs b/Runtime/GetCollection.cs
@@ -3,7 +3,6 @@
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.Networking;
-using UnityEditor.VSAttribution.AlturaNFT;
 
 namespace AlturaNFT  
 { using Internal;
@@ -124,7 +123,7 @@ string BuildUrl()
                 WEB_URL = RequestUriInit + _collection_address;
 
                 if(debugErrorLog)
-                    Debug.Log("Querying Transactions of Collection: " + _collection_address );
+                    Debug.Log("Querying information of Collection: " + _collection_address );
 
                 return WEB_URL;
             }
@@ -135,7 +134,6 @@ IEnumerator CallAPIProcess()
                 UnityWebRequest request = UnityWebRequest.Get(WEB_URL);
                 request.SetRequestHeader("Content-Type", "application/json");
                 request.SetRequestHeader("source", AlturaUser.GetSource());
-                VSAttribution.SendAttributionEvent("GetCollection","AlturaNFT", _apiKey);
 
             string url = "https://api.alturanft.com/api/sdk/unity/";
             WWWForm form = new WWWForm();

diff --git a/Runtime/GetCollections.cs b/Runtime/GetCollections.cs
@@ -3,7 +3,7 @@
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.Networking;
-using UnityEditor.VSAttribution.AlturaNFT;
+
 
 namespace AlturaNFT  
 { using Internal;
@@ -193,7 +193,7 @@ string BuildUrl()
 
                     WEB_URL = RequestUriInit + "?" + jsonString;
                     if(debugErrorLog)
-                        Debug.Log("Querying Details of User: " );
+                        Debug.Log("Querying Details of Collections: " );
 
                 return WEB_URL;
             }
@@ -204,7 +204,6 @@ IEnumerator CallAPIProcess()
                 UnityWebRequest request = UnityWebRequest.Get(WEB_URL);
             request.SetRequestHeader("Content-Type", "application/json");
                 request.SetRequestHeader("source", AlturaUser.GetSource());
-                VSAttribution.SendAttributionEvent("GetCollections","AlturaNFT", _apiKey);
             string url = "https://api.alturanft.com/api/sdk/unity/";
             WWWForm form = new WWWForm();
             UnityWebRequest www = UnityWebRequest.Post(url + "GetCollections" + "?apiKey=" + _apiKey, form);

diff --git a/Runtime/GetHistory.cs b/Runtime/GetHistory.cs
@@ -3,7 +3,7 @@
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.Networking;
-using UnityEditor.VSAttribution.AlturaNFT;
+
 
 namespace AlturaNFT  
 { using Internal;
@@ -137,7 +137,7 @@ string BuildUrl()
 
                     WEB_URL = RequestUriInit + "/" + _address + "/" + _token_id.ToString();
                     if(debugErrorLog)
-                        Debug.Log("Querying Single Holders Items by address and tokenId: " + _address + " on " );
+                        Debug.Log("Querying History Items by address and tokenId: " + _address + " on " );
                 return WEB_URL;
             }
 
@@ -147,7 +147,6 @@ IEnumerator CallAPIProcess()
                 UnityWebRequest request = UnityWebRequest.Get(WEB_URL);
                 request.SetRequestHeader("Content-Type", "application/json");
                 request.SetRequestHeader("source", AlturaUser.GetSource());
-                VSAttribution.SendAttributionEvent("GetHistoty","AlturaNFT", _apiKey);
 
             string url = "https://api.alturanft.com/api/sdk/unity/";
             WWWForm form = new WWWForm();

diff --git a/Runtime/GetHolder.cs b/Runtime/GetHolder.cs
@@ -3,7 +3,7 @@
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.Networking;
-using UnityEditor.VSAttribution.AlturaNFT;
+
 
 namespace AlturaNFT  
 { using Internal;
@@ -146,7 +146,6 @@ IEnumerator CallAPIProcess()
                 //Make request
                 UnityWebRequest request = UnityWebRequest.Get(WEB_URL);
                 request.SetRequestHeader("Content-Type", "application/json");
-                VSAttribution.SendAttributionEvent("GetHolder","AlturaNFT", _apiKey);
 
             string url = "https://api.alturanft.com/api/sdk/unity/";
             WWWForm form = new WWWForm();

diff --git a/Runtime/GetItem.cs b/Runtime/GetItem.cs
@@ -3,7 +3,7 @@
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.Networking;
-using UnityEditor.VSAttribution.AlturaNFT;
+
 
 namespace AlturaNFT  
 { using Internal;
@@ -146,7 +146,6 @@ IEnumerator CallAPIProcess()
                 //Make request
                 UnityWebRequest request = UnityWebRequest.Get(WEB_URL);
                 request.SetRequestHeader("Content-Type", "application/json");
-                VSAttribution.SendAttributionEvent("GetItem","AlturaNFT", _apiKey);
 
             string url = "https://api.alturanft.com/api/sdk/unity/";
             WWWForm form = new WWWForm();

diff --git a/Runtime/GetItems.cs b/Runtime/GetItems.cs
@@ -3,7 +3,7 @@
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.Networking;
-using UnityEditor.VSAttribution.AlturaNFT;
+
 
 namespace AlturaNFT  
 { using Internal;
@@ -47,7 +47,6 @@ public enum Chains
             private string _slim = "false";
 
 
-            [SerializeField]
             [Tooltip("Filter from a documents by any properties")]
             [DrawIf("chain", Chains.binance , DrawIfAttribute.DisablingType.DontDrawInverse)]
             private string jsonString;
@@ -212,7 +211,7 @@ string BuildUrl()
                 if (this._sortDir != null)
                 this.jsonString += "&sortDir=" + this._sortDir;
                 if(this._slim!=null)
-                this.jsonString = "&slim=" + this._slim;
+                this.jsonString += "&slim=" + this._slim;
                 if (this._name != null)
                 this.jsonString += "&name=" + this._name;
                 if (this._collectionAddress != null)
@@ -240,8 +239,7 @@ IEnumerator CallAPIProcess()
             {
                 //Make request
                 UnityWebRequest request = UnityWebRequest.Get(WEB_URL);
-                request.SetRequestHeader("Content-Type", "application/json");
-                VSAttribution.SendAttributionEvent("GetItems","AlturaNFT", _apiKey);                
+                request.SetRequestHeader("Content-Type", "application/json");    
             string url = "https://api.alturanft.com/api/sdk/unity/";
             WWWForm form = new WWWForm();
             UnityWebRequest www = UnityWebRequest.Post(url + "GetItems" + "?apiKey=" + _apiKey, form);

diff --git a/Runtime/GetUser.cs b/Runtime/GetUser.cs
@@ -3,7 +3,7 @@
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.Networking;
-using UnityEditor.VSAttribution.AlturaNFT;
+
 
 namespace AlturaNFT  
 
@@ -137,8 +137,7 @@ IEnumerator CallAPIProcess()
             {
                 //Make request
                 UnityWebRequest request = UnityWebRequest.Get(WEB_URL);
-                request.SetRequestHeader("Content-Type", "application/json");
-                VSAttribution.SendAttributionEvent("GetUser","AlturaNFT", _apiKey);                
+                request.SetRequestHeader("Content-Type", "application/json");             
             string url = "https://api.alturanft.com/api/sdk/unity/";
             WWWForm form = new WWWForm();
             UnityWebRequest www = UnityWebRequest.Post(url + "GetUser" + "?apiKey=" + _apiKey, form);

diff --git a/Runtime/GetUsers.cs b/Runtime/GetUsers.cs
@@ -3,7 +3,7 @@
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.Networking;
-using UnityEditor.VSAttribution.AlturaNFT;
+
 namespace AlturaNFT  
 { using Internal;
 
@@ -185,8 +185,7 @@ IEnumerator CallAPIProcess()
             {
                 //Make request
                 UnityWebRequest request = UnityWebRequest.Get(WEB_URL);
-                request.SetRequestHeader("Content-Type", "application/json");    
-                VSAttribution.SendAttributionEvent("GetUsers","AlturaNFT", _apiKey);            
+                request.SetRequestHeader("Content-Type", "application/json");              
             string url = "https://api.alturanft.com/api/sdk/unity/";
             WWWForm form = new WWWForm();
             UnityWebRequest www = UnityWebRequest.Post(url + "GetUsers" + "?apiKey=" + _apiKey, form);

diff --git a/Runtime/GetUsersItems.cs b/Runtime/GetUsersItems.cs
@@ -6,7 +6,7 @@
 using UnityEngine.Events;
 using UnityEngine.Networking;
 using UnityEngine.Serialization;
-using UnityEditor.VSAttribution.AlturaNFT;
+
 
 namespace AlturaNFT  
 { using Internal;
@@ -190,7 +190,6 @@ IEnumerator CallAPIProcess()
                 //Make request
                 UnityWebRequest request = UnityWebRequest.Get(WEB_URL);
                 request.SetRequestHeader("Content-Type", "application/json");
-                VSAttribution.SendAttributionEvent("GetUsersItems","AlturaNFT", _apiKey);
             string url = "https://api.alturanft.com/api/sdk/unity/";
             WWWForm form = new WWWForm();
             UnityWebRequest www = UnityWebRequest.Post(url + "GetUsersItems" + "?apiKey=" + _apiKey, form);

diff --git a/Runtime/Internal/AlturaConstants.cs b/Runtime/Internal/AlturaConstants.cs
@@ -51,6 +51,8 @@ public static class AlturaConstants
         public const string FeatureName_GetCollections = "Get Many Collections | GetCollections";
         public const string FeatureName_GetCollection = "Get 1 Collection | GetCollection";
         public const string FeatureName_Transfer = "Transfer | TransferItem";
+        public const string FeatureName_TransferErc721 = "Transfer ERC721";
+        public const string FeatureName_TransferErc20 = "Transfer ERC20";
         public const string FeatureName_TransferItems = "Transfers | TransferItems";
         public const string FeatureName_MintAdditionalNFT = "Mint | MintAdditionalNFT";
         public const string FeatureName_GetHolder = "Get Holder | Get Holder";

diff --git a/Runtime/Internal/AlturaUserSettings.cs b/Runtime/Internal/AlturaUserSettings.cs
@@ -5,7 +5,7 @@
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.Networking;
-using UnityEditor.VSAttribution.AlturaNFT;
+
 
 namespace AlturaNFT
 {   using Internal;
@@ -143,7 +143,6 @@ IEnumerator CallAPIProcess()
             request.SetRequestHeader("Content-Type", "application/json");
             request.SetRequestHeader("source",  AlturaUser.GetSource());
             request.SetRequestHeader("Authorization", _apiKey);
-                VSAttribution.SendAttributionEvent("AlturaUserSetting","AlturaNFT", _apiKey);
             string url = "https://api.alturanft.com/api/sdk/unity/";
             WWWForm form = new WWWForm();
             UnityWebRequest www = UnityWebRequest.Post(url + "AlturaUserSetting" + "?apiKey=" + _apiKey, form);

diff --git a/Runtime/Internal/models/NFTs_model.cs b/Runtime/Internal/models/NFTs_model.cs
@@ -19,7 +19,7 @@ public class Items
     {
         public string name;
         public string description;
-        //public Properties properties;
+        public Properties[] properties;
         public int tokenId;
         public string collectionAddress;
         public int chainId;
@@ -67,10 +67,9 @@ public class AllImages
     [Serializable]
     public class Properties
     {
-        public string _id;
         public string name;
         public string value;
-        public string staatic;
+       // public string static;
 
     }
 

diff --git a/Runtime/Internal/models/Txn_model.cs b/Runtime/Internal/models/Txn_model.cs
@@ -26,7 +26,7 @@ public class MintReq
         public string address;
         public string to;
         public string tokenId;
-        public string amounts;
+        public string amount;
     }
     [Serializable]
     public class TransferReq