diff --git a/Packages/io.chainsafe.web3-unity.marketplace/Runtime/Scripts/Marketplace/Marketplace.cs b/Packages/io.chainsafe.web3-unity.marketplace/Runtime/Scripts/Marketplace/Marketplace.cs index 138e8d738..34c7ff09d 100644 --- a/Packages/io.chainsafe.web3-unity.marketplace/Runtime/Scripts/Marketplace/Marketplace.cs +++ b/Packages/io.chainsafe.web3-unity.marketplace/Runtime/Scripts/Marketplace/Marketplace.cs @@ -279,6 +279,7 @@ public static async Task Mint721CollectionNft(string _bearer var path = "/nft?hash=blake2b-208"; var collectionResponse = await CSServer.CreateData(_bearerToken, path, formData); var collectionData = JsonConvert.DeserializeObject(collectionResponse); + Debug.Log($"CID: {collectionData.cid}"); var method = "mint"; object[] args = { @@ -286,7 +287,11 @@ public static async Task Mint721CollectionNft(string _bearer collectionData.cid }; var contract = Web3Accessor.Web3.ContractBuilder.Build(ABI.GeneralErc721, _collectionContract); - var data = await contract.SendWithReceipt(method, args); + var txArgs = new TransactionRequest + { + GasLimit = new HexBigInteger(90000) + }; + var data = await contract.SendWithReceipt(method, args, txArgs); return data.receipt; } catch (Web3Exception e) @@ -294,6 +299,11 @@ public static async Task Mint721CollectionNft(string _bearer Console.WriteLine(e); throw; } + catch (Exception e) + { + Debug.LogError("Error: " + e.Message); + throw; + } } /// @@ -319,13 +329,14 @@ public static async Task Mint1155CollectionNft(string _beare }; if (!string.IsNullOrEmpty(_description)) { - formData.Insert(2, new MultipartFormDataSection("description", _description)); + formData.Insert(1, new MultipartFormDataSection("description", _description)); } var path = "/nft?hash=blake2b-208"; var collectionResponse = await CSServer.CreateData(_bearerToken, path, formData); var collectionData = JsonConvert.DeserializeObject(collectionResponse); var method = "mint"; var amount = BigInteger.Parse(_amount); + Debug.Log($"Amount3: {amount}"); object[] args = { Web3Accessor.Web3.Signer.PublicAddress, @@ -334,7 +345,11 @@ public static async Task Mint1155CollectionNft(string _beare }; var contract = Web3Accessor.Web3.ContractBuilder.Build(ABI.GeneralErc1155, _collectionContract); - var data = await contract.SendWithReceipt(method, args); + var txArgs = new TransactionRequest + { + GasLimit = new HexBigInteger(90000) + }; + var data = await contract.SendWithReceipt(method, args, txArgs); return data.receipt; } catch (Web3Exception e) @@ -342,6 +357,11 @@ public static async Task Mint1155CollectionNft(string _beare Console.WriteLine(e); throw; } + catch (Exception e) + { + Debug.LogError("Error: " + e.Message); + throw; + } } /// @@ -435,7 +455,7 @@ public static async Task SetApprovalMarketplace(string _nftC _marketplaceContract, _permission }; - var abi = _type == "721" ? Token.ABI.GeneralErc721 : Token.ABI.GeneralErc1155; + var abi = _type == "ERC721" ? Token.ABI.GeneralErc721 : Token.ABI.GeneralErc1155; var contract = Web3Accessor.Web3.ContractBuilder.Build(abi, _nftContract); var data = await contract.SendWithReceipt(method, args); return data.receipt; diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Scripts/EVM/Remote/CSServer.cs b/Packages/io.chainsafe.web3-unity/Runtime/Scripts/EVM/Remote/CSServer.cs index 2759ee429..cbba1d8a0 100644 --- a/Packages/io.chainsafe.web3-unity/Runtime/Scripts/EVM/Remote/CSServer.cs +++ b/Packages/io.chainsafe.web3-unity/Runtime/Scripts/EVM/Remote/CSServer.cs @@ -1,6 +1,8 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Threading.Tasks; using ChainSafe.Gaming.UnityPackage; +using ChainSafe.Gaming.Web3; using Newtonsoft.Json; using UnityEngine; using UnityEngine.Networking; @@ -75,7 +77,7 @@ public static async Task DeleteData(string _bearerToken, string _path) if (request.result != UnityWebRequest.Result.Success) { Debug.LogError($"Error deleting: {request.error}"); - return request.error; + throw new Exception($"Error: {request.error}"); } return "Deleted successfully"; } @@ -93,16 +95,17 @@ public static async Task CreateData(string _bearerToken, string _path, var url = $"{host}{Web3Accessor.Web3.ProjectConfig.ProjectId}{_path}"; if (_path == "/nft?hash=blake2b-208") { - url = "https://api.chainsafe.io/v1/nft?hash=blake2b-208"; + url = "https://api.chainsafe.io/api/v1/nft?hash=blake2b-208"; } using (UnityWebRequest request = UnityWebRequest.Post($"{url}", _formData)) { request.SetRequestHeader("Authorization", $"Bearer {_bearerToken}"); + request.SetRequestHeader("Accept", "application/json"); await request.SendWebRequest(); if (request.result != UnityWebRequest.Result.Success) { Debug.LogError("Creation failed: " + request.downloadHandler.text); - return request.error; + throw new Exception($"Error: {request.error}"); } return request.downloadHandler.text; } diff --git a/src/UnitySampleProject/Assets/Samples/web3.unity SDK Marketplace/2.6.1/Marketplace Samples/Prefabs/GUI/MarketplaceGUI.prefab b/src/UnitySampleProject/Assets/Samples/web3.unity SDK Marketplace/2.6.1/Marketplace Samples/Prefabs/GUI/MarketplaceGUI.prefab index a8c03bdf1..cb55cf3d5 100644 --- a/src/UnitySampleProject/Assets/Samples/web3.unity SDK Marketplace/2.6.1/Marketplace Samples/Prefabs/GUI/MarketplaceGUI.prefab +++ b/src/UnitySampleProject/Assets/Samples/web3.unity SDK Marketplace/2.6.1/Marketplace Samples/Prefabs/GUI/MarketplaceGUI.prefab @@ -624,93 +624,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &358201951728652295 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2614048240185899021} - - component: {fileID: 1048522520917852947} - m_Layer: 5 - m_Name: Item - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2614048240185899021 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 358201951728652295} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5374799215431879666} - - {fileID: 8063539334614039680} - - {fileID: 3507404184829421531} - m_Father: {fileID: 8621354056873024679} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1048522520917852947 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 358201951728652295} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 7454532269157074077} - toggleTransition: 1 - graphic: {fileID: 8826133440471921002} - m_Group: {fileID: 0} - onValueChanged: - m_PersistentCalls: - m_Calls: [] - m_IsOn: 1 --- !u!1 &401457297266215601 GameObject: m_ObjectHideFlags: 0 @@ -1703,7 +1616,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e666e530bf95499d88eb8518b986e201, type: 3} m_Name: m_EditorClassIdentifier: - typeDropDown: {fileID: 7839259503990321252} nameInput: {fileID: 694220348290770310} descriptionInput: {fileID: 4638606149364710753} amountInput: {fileID: 2465004270672995043} @@ -2068,143 +1980,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &960014648121480778 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5288585483828535152} - - component: {fileID: 3416053951375020249} - - component: {fileID: 3346134457556421037} - - component: {fileID: 7839259503990321252} - m_Layer: 5 - m_Name: MintNftTypeDropdown - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5288585483828535152 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 960014648121480778} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4581066510451229118} - - {fileID: 4012265432301573910} - - {fileID: 4500091834240860955} - m_Father: {fileID: 2656086463953066730} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -122, y: -215} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3416053951375020249 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 960014648121480778} - m_CullTransparentMesh: 1 ---- !u!114 &3346134457556421037 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 960014648121480778} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &7839259503990321252 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 960014648121480778} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7b743370ac3e4ec2a1668f5455a8ef8a, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 3346134457556421037} - m_Template: {fileID: 4500091834240860955} - m_CaptionText: {fileID: 7723641676009152580} - m_CaptionImage: {fileID: 0} - m_Placeholder: {fileID: 0} - m_ItemText: {fileID: 6025560694848451857} - m_ItemImage: {fileID: 0} - m_Value: 0 - m_Options: - m_Options: - - m_Text: 721 - m_Image: {fileID: 0} - - m_Text: 1155 - m_Image: {fileID: 0} - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] - m_AlphaFadeSpeed: 0.15 --- !u!1 &1105746401947283171 GameObject: m_ObjectHideFlags: 0 @@ -3120,11 +2895,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 2656086463953066730} + m_Father: {fileID: 6411057254781245655} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -77} + m_AnchoredPosition: {x: 0, y: 46} m_SizeDelta: {x: 651.7679, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5260213038981852087 @@ -3448,42 +3223,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &1962042544436868979 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9010271832463797373} - m_Layer: 5 - m_Name: Sliding Area - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &9010271832463797373 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1962042544436868979} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4779973159200532976} - m_Father: {fileID: 3007528511551589604} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1994490179956958755 GameObject: m_ObjectHideFlags: 0 @@ -5280,7 +5019,7 @@ MonoBehaviour: m_EffectColor: {r: 1, g: 1, b: 1, a: 0.5} m_EffectDistance: {x: 2, y: 2} m_UseGraphicAlpha: 0 ---- !u!1 &2790747591478700214 +--- !u!1 &2798112859506301484 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -5288,53 +5027,53 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4500091834240860955} - - component: {fileID: 4001714617608090785} - - component: {fileID: 78944482918409333} - - component: {fileID: 3836266316513815641} + - component: {fileID: 6411057254781245655} + - component: {fileID: 2314527281187284569} + - component: {fileID: 4562077150948035617} + - component: {fileID: 2465004270672995043} m_Layer: 5 - m_Name: Template + m_Name: AmountMintNftToCollectionInput m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &4500091834240860955 + m_IsActive: 1 +--- !u!224 &6411057254781245655 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2790747591478700214} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 2798112859506301484} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 5310188009472886359} - - {fileID: 3007528511551589604} - m_Father: {fileID: 5288585483828535152} + - {fileID: 4007557524947863484} + - {fileID: 4944155594465993408} + m_Father: {fileID: 2656086463953066730} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 2} - m_SizeDelta: {x: 0, y: 150} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &4001714617608090785 + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -123} + m_SizeDelta: {x: 400, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2314527281187284569 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2790747591478700214} + m_GameObject: {fileID: 2798112859506301484} m_CullTransparentMesh: 1 ---- !u!114 &78944482918409333 +--- !u!114 &4562077150948035617 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2790747591478700214} + m_GameObject: {fileID: 2798112859506301484} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -5348,7 +5087,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5358,120 +5097,13 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &3836266316513815641 +--- !u!114 &2465004270672995043 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2790747591478700214} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Content: {fileID: 8621354056873024679} - m_Horizontal: 0 - m_Vertical: 1 - m_MovementType: 2 - m_Elasticity: 0.1 - m_Inertia: 1 - m_DecelerationRate: 0.135 - m_ScrollSensitivity: 1 - m_Viewport: {fileID: 5310188009472886359} - m_HorizontalScrollbar: {fileID: 0} - m_VerticalScrollbar: {fileID: 603841479193976789} - m_HorizontalScrollbarVisibility: 0 - m_VerticalScrollbarVisibility: 2 - m_HorizontalScrollbarSpacing: 0 - m_VerticalScrollbarSpacing: -3 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] ---- !u!1 &2798112859506301484 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6411057254781245655} - - component: {fileID: 2314527281187284569} - - component: {fileID: 4562077150948035617} - - component: {fileID: 2465004270672995043} - m_Layer: 5 - m_Name: AmountMintNftToCollectionInput - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6411057254781245655 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2798112859506301484} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4007557524947863484} - m_Father: {fileID: 2656086463953066730} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -123} - m_SizeDelta: {x: 400, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2314527281187284569 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2798112859506301484} - m_CullTransparentMesh: 1 ---- !u!114 &4562077150948035617 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2798112859506301484} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &2465004270672995043 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2798112859506301484} + m_GameObject: {fileID: 2798112859506301484} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 2da0c512f12947e489f739169773d7ca, type: 3} @@ -7051,10 +6683,8 @@ RectTransform: - {fileID: 3482592547130778973} - {fileID: 6993879403514890552} - {fileID: 7436217953828111666} - - {fileID: 4944155594465993408} - {fileID: 6411057254781245655} - {fileID: 5441748315277546503} - - {fileID: 5288585483828535152} - {fileID: 1597146507627077834} - {fileID: 6851920741925923088} m_Father: {fileID: 131361396315675251} @@ -7168,42 +6798,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Padding: {x: -8, y: -5, z: -8, w: -5} m_Softness: {x: 0, y: 0} ---- !u!1 &3765371822828981053 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8621354056873024679} - m_Layer: 5 - m_Name: Content - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8621354056873024679 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3765371822828981053} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2614048240185899021} - m_Father: {fileID: 5310188009472886359} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 28} - m_Pivot: {x: 0.5, y: 1} --- !u!1 &3805985975664294240 GameObject: m_ObjectHideFlags: 0 @@ -9703,7 +9297,7 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &4976938174200123080 +--- !u!1 &5043809974608778663 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -9711,50 +9305,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4581066510451229118} - - component: {fileID: 8623498519319618501} - - component: {fileID: 7723641676009152580} + - component: {fileID: 5441748315277546503} + - component: {fileID: 7332464880606398727} + - component: {fileID: 6102652092133776835} m_Layer: 5 - m_Name: Label + m_Name: DescriptionSetTypeMintNftToCollection m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4581066510451229118 +--- !u!224 &5441748315277546503 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4976938174200123080} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 5043809974608778663} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 5288585483828535152} + m_Father: {fileID: 2656086463953066730} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -7.5, y: -0.5} - m_SizeDelta: {x: -35, y: -13} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -168} + m_SizeDelta: {x: 651.7679, y: 40} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8623498519319618501 +--- !u!222 &7332464880606398727 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4976938174200123080} + m_GameObject: {fileID: 5043809974608778663} m_CullTransparentMesh: 1 ---- !u!114 &7723641676009152580 +--- !u!114 &6102652092133776835 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4976938174200123080} + m_GameObject: {fileID: 5043809974608778663} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -9768,7 +9362,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 721 + m_text: ' UPLOAD IMAGE' m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -9777,8 +9371,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -9795,13 +9389,13 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 14 - m_fontSizeBase: 14 + m_fontSize: 20 + m_fontSizeBase: 20 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 0 + m_fontStyle: 1 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 @@ -9837,7 +9431,7 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &5043809974608778663 +--- !u!1 &5084049308408844160 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -9845,193 +9439,59 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5441748315277546503} - - component: {fileID: 7332464880606398727} - - component: {fileID: 6102652092133776835} + - component: {fileID: 5044020712972274904} + - component: {fileID: 255140397206324392} + - component: {fileID: 6710514359454962737} + - component: {fileID: 6855685658625549824} m_Layer: 5 - m_Name: DescriptionSetTypeMintNftToCollection + m_Name: ListNftButtonListNftToMarketplace m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &5441748315277546503 +--- !u!224 &5044020712972274904 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5043809974608778663} + m_GameObject: {fileID: 5084049308408844160} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2656086463953066730} + m_Children: + - {fileID: 8767365658904978446} + m_Father: {fileID: 3390890584862474385} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -168} - m_SizeDelta: {x: 651.7679, y: 40} + m_AnchoredPosition: {x: 0, y: -167} + m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7332464880606398727 +--- !u!222 &255140397206324392 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5043809974608778663} + m_GameObject: {fileID: 5084049308408844160} m_CullTransparentMesh: 1 ---- !u!114 &6102652092133776835 +--- !u!114 &6710514359454962737 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5043809974608778663} + m_GameObject: {fileID: 5084049308408844160} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: SELECT NFT TYPE & UPLOAD IMAGE - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 1 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &5084049308408844160 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5044020712972274904} - - component: {fileID: 255140397206324392} - - component: {fileID: 6710514359454962737} - - component: {fileID: 6855685658625549824} - m_Layer: 5 - m_Name: ListNftButtonListNftToMarketplace - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5044020712972274904 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5084049308408844160} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 8767365658904978446} - m_Father: {fileID: 3390890584862474385} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -167} - m_SizeDelta: {x: 200, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &255140397206324392 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5084049308408844160} - m_CullTransparentMesh: 1 ---- !u!114 &6710514359454962737 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5084049308408844160} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.09803922, g: 1, b: 0, a: 1} + m_Color: {r: 0.09803922, g: 1, b: 0, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -12207,132 +11667,6 @@ MonoBehaviour: m_isRichTextEditingAllowed: 0 m_LineLimit: 0 m_InputValidator: {fileID: 0} ---- !u!1 &5648639115415316424 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3007528511551589604} - - component: {fileID: 8623520644933604812} - - component: {fileID: 2083022273118182829} - - component: {fileID: 603841479193976789} - m_Layer: 5 - m_Name: Scrollbar - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3007528511551589604 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5648639115415316424} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 9010271832463797373} - m_Father: {fileID: 4500091834240860955} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 0} - m_Pivot: {x: 1, y: 1} ---- !u!222 &8623520644933604812 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5648639115415316424} - m_CullTransparentMesh: 1 ---- !u!114 &2083022273118182829 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5648639115415316424} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &603841479193976789 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5648639115415316424} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 5124363012101441336} - m_HandleRect: {fileID: 4779973159200532976} - m_Direction: 2 - m_Value: 0 - m_Size: 1 - m_NumberOfSteps: 0 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] --- !u!1 &5741126886881254601 GameObject: m_ObjectHideFlags: 0 @@ -13638,81 +12972,6 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_AlphaFadeSpeed: 0.15 ---- !u!1 &6323590220047241211 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4012265432301573910} - - component: {fileID: 4957729581436704956} - - component: {fileID: 5035167259949956351} - m_Layer: 5 - m_Name: Arrow - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4012265432301573910 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6323590220047241211} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 5288585483828535152} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -15, y: 0} - m_SizeDelta: {x: 20, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4957729581436704956 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6323590220047241211} - m_CullTransparentMesh: 1 ---- !u!114 &5035167259949956351 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6323590220047241211} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10915, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &6382282640535476161 GameObject: m_ObjectHideFlags: 0 @@ -16064,81 +15323,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7851478894277402122 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8063539334614039680} - - component: {fileID: 3807259516058059525} - - component: {fileID: 8826133440471921002} - m_Layer: 5 - m_Name: Item Checkmark - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8063539334614039680 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7851478894277402122} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2614048240185899021} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 10, y: 0} - m_SizeDelta: {x: 20, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3807259516058059525 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7851478894277402122} - m_CullTransparentMesh: 1 ---- !u!114 &8826133440471921002 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7851478894277402122} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &7911120049507062898 GameObject: m_ObjectHideFlags: 0 @@ -16260,140 +15444,6 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] ---- !u!1 &8000269268476430733 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3507404184829421531} - - component: {fileID: 3634715947346502215} - - component: {fileID: 6025560694848451857} - m_Layer: 5 - m_Name: Item Label - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3507404184829421531 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8000269268476430733} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2614048240185899021} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 5, y: -0.5} - m_SizeDelta: {x: -30, y: -3} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3634715947346502215 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8000269268476430733} - m_CullTransparentMesh: 1 ---- !u!114 &6025560694848451857 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8000269268476430733} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: 721 - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 14 - m_fontSizeBase: 14 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &8067335438723209310 GameObject: m_ObjectHideFlags: 0 @@ -16430,7 +15480,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 116, y: -216} + m_AnchoredPosition: {x: 0, y: -216} m_SizeDelta: {x: 220, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2996283989338463149 @@ -16515,81 +15565,6 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] ---- !u!1 &8095563605059485219 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4779973159200532976} - - component: {fileID: 8587696661342965757} - - component: {fileID: 5124363012101441336} - m_Layer: 5 - m_Name: Handle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4779973159200532976 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8095563605059485219} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 9010271832463797373} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8587696661342965757 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8095563605059485219} - m_CullTransparentMesh: 1 ---- !u!114 &5124363012101441336 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8095563605059485219} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &8101430833541444927 GameObject: m_ObjectHideFlags: 0 @@ -16954,96 +15929,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &8213538205600820413 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5310188009472886359} - - component: {fileID: 4075535324400184352} - - component: {fileID: 1551396073634369371} - - component: {fileID: 2524786264758690582} - m_Layer: 5 - m_Name: Viewport - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5310188009472886359 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8213538205600820413} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 8621354056873024679} - m_Father: {fileID: 4500091834240860955} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -17, y: 0} - m_Pivot: {x: 0, y: 1} ---- !u!114 &4075535324400184352 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8213538205600820413} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 0 ---- !u!222 &1551396073634369371 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8213538205600820413} - m_CullTransparentMesh: 1 ---- !u!114 &2524786264758690582 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8213538205600820413} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &8342607218803173779 GameObject: m_ObjectHideFlags: 0 @@ -19431,81 +18316,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &9053210634534071090 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5374799215431879666} - - component: {fileID: 3503841866693861376} - - component: {fileID: 7454532269157074077} - m_Layer: 5 - m_Name: Item Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5374799215431879666 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9053210634534071090} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2614048240185899021} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3503841866693861376 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9053210634534071090} - m_CullTransparentMesh: 1 ---- !u!114 &7454532269157074077 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9053210634534071090} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &9098698389870154936 GameObject: m_ObjectHideFlags: 0 diff --git a/src/UnitySampleProject/Assets/Samples/web3.unity SDK Marketplace/2.6.1/Marketplace Samples/Scripts/BrowseCollectionManager.cs b/src/UnitySampleProject/Assets/Samples/web3.unity SDK Marketplace/2.6.1/Marketplace Samples/Scripts/BrowseCollectionManager.cs index cf3d9f8d8..b9a5c553a 100644 --- a/src/UnitySampleProject/Assets/Samples/web3.unity SDK Marketplace/2.6.1/Marketplace Samples/Scripts/BrowseCollectionManager.cs +++ b/src/UnitySampleProject/Assets/Samples/web3.unity SDK Marketplace/2.6.1/Marketplace Samples/Scripts/BrowseCollectionManager.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Linq; using System.Threading.Tasks; using ChainSafe.Gaming.Marketplace; using ChainSafe.Gaming.Web3; @@ -40,12 +41,6 @@ public class BrowseCollectionManager : MonoBehaviour private TMP_FontAsset DisplayFont { get; set; } private Color SecondaryTextColour { get; set; } - private enum CollectionType - { - ERC721, - ERC1155, - Unknown - } #endregion @@ -75,12 +70,13 @@ private async void GetProjectCollections() /// /// Populates Collections and adds them to the display panel. /// - private void PopulateCollections(UnityPackage.Model.NftTokenModel.ProjectCollectionsResponse collectionsResponse) + private async void PopulateCollections(UnityPackage.Model.NftTokenModel.ProjectCollectionsResponse collectionsResponse) { - foreach (var collection in collectionsResponse.collections) + foreach (var collection in collectionsResponse.collections.Where(collection => collection.type is "ERC721" or "ERC1155")) { - AddCollectionToDisplay(collection.name, collection.type, baseUrl + collection.banner); + await AddCollectionToDisplay(collection.name, collection.type, baseUrl + collection.banner); } + EventManagerMarketplace.RaiseToggleProcessingMenu(); } @@ -97,32 +93,28 @@ private async void PopulateCollectionItems(int index, string collectionType) EventManagerMarketplace.RaiseToggleProcessingMenu(); return; } - var collectionContract = projectResponse.tokens[index].collection_id; - var mintCollectionNftConfigArgs = new EventManagerMarketplace.MintCollectionNftConfigEventArgs(null, collectionContract); + var collectionContract = projectResponse.tokens[index].contract_address; + var mintCollectionNftConfigArgs = new EventManagerMarketplace.MintCollectionNftConfigEventArgs(null, collectionContract, collectionType); EventManagerMarketplace.RaiseMintCollectionNftManager(mintCollectionNftConfigArgs); - if (!Enum.TryParse(collectionType, true, out CollectionType collectionTypeEnum)) - { - collectionTypeEnum = CollectionType.Unknown; - } - switch (collectionTypeEnum) + switch (collectionType) { - case CollectionType.ERC721: + case "ERC721": { var response = await EvmMarketplace.GetCollectionTokens721(projectResponse.tokens[index].collection_id); foreach (var item in response.tokens) { - AddCollectionItemToDisplay(collectionContract, item.token_id, item.token_type, item.supply, item.uri); + await AddCollectionItemToDisplay(collectionContract, item.token_id, item.token_type, item.supply, item.uri); } EventManagerMarketplace.RaiseToggleProcessingMenu(); break; } - case CollectionType.ERC1155: + case "ERC1155": { var response = await EvmMarketplace.GetCollectionTokens1155(projectResponse.tokens[index].collection_id); foreach (var item in response.tokens) { - AddCollectionItemToDisplay(collectionContract, item.token_id, item.token_type, item.supply, item.uri); + await AddCollectionItemToDisplay(collectionContract, item.token_id, item.token_type, item.supply, item.uri); } EventManagerMarketplace.RaiseToggleProcessingMenu(); @@ -141,7 +133,7 @@ private async void PopulateCollectionItems(int index, string collectionType) /// Collection name to add. /// Collection type. /// Collection image uri to add. - private void AddCollectionToDisplay(string collectionName, string collectionType, string collectionBannerUri) + private async Task AddCollectionToDisplay(string collectionName, string collectionType, string collectionBannerUri) { if (projectCollectionsObjectNumber >= projectCollectionsDisplayCount) { @@ -151,12 +143,12 @@ private void AddCollectionToDisplay(string collectionName, string collectionType projectCollectionsPrefabs[i - 1] = projectCollectionsPrefabs[i]; } projectCollectionsPrefabs[projectCollectionsPrefabs.Length - 1] = Instantiate(projectCollectionsPrefab, CollectionPanel.transform); - UpdateProjectCollectionsDisplay(projectCollectionsObjectNumber, collectionName, collectionType, collectionBannerUri); + await UpdateProjectCollectionsDisplay(projectCollectionsObjectNumber, collectionName, collectionType, collectionBannerUri); } else { projectCollectionsPrefabs[projectCollectionsObjectNumber] = Instantiate(projectCollectionsPrefab, CollectionPanel.transform); - UpdateProjectCollectionsDisplay(projectCollectionsObjectNumber, collectionName, collectionType, collectionBannerUri); + await UpdateProjectCollectionsDisplay(projectCollectionsObjectNumber, collectionName, collectionType, collectionBannerUri); } projectCollectionsObjectNumber++; CollectionScrollRect.horizontalNormalizedPosition = 0; @@ -167,10 +159,10 @@ private void AddCollectionToDisplay(string collectionName, string collectionType /// /// Collection contract. /// Nft id. - /// Nft name. + /// Nft type. /// Nft supply. /// Nft Uri. - private void AddCollectionItemToDisplay(string collectionContract, string nftId, string nftType, string supply, string nftUri) + private async Task AddCollectionItemToDisplay(string collectionContract, string nftId, string nftType, string supply, string nftUri) { if (CollectionItemsObjectNumber >= CollectionItemDisplayCount) { @@ -180,12 +172,12 @@ private void AddCollectionItemToDisplay(string collectionContract, string nftId, CollectionItemPrefabs[i - 1] = CollectionItemPrefabs[i]; } CollectionItemPrefabs[CollectionItemPrefabs.Length - 1] = Instantiate(CollectionItemPrefab, CollectionPanel.transform); - UpdateCollectionItemDisplay(collectionContract, CollectionItemsObjectNumber, nftId, nftType, supply, nftUri); + await UpdateCollectionItemDisplay(collectionContract, CollectionItemsObjectNumber, nftId, nftType, supply, nftUri); } else { CollectionItemPrefabs[CollectionItemsObjectNumber] = Instantiate(CollectionItemPrefab, CollectionPanel.transform); - UpdateCollectionItemDisplay(collectionContract, CollectionItemsObjectNumber, nftId, nftType, supply, nftUri); + await UpdateCollectionItemDisplay(collectionContract, CollectionItemsObjectNumber, nftId, nftType, supply, nftUri); } CollectionItemsObjectNumber++; CollectionScrollRect.horizontalNormalizedPosition = 0; @@ -214,8 +206,9 @@ private async Task ImportTexture(string uri) /// Collection name. /// Collection type. /// Collection Uri. - private async void UpdateProjectCollectionsDisplay(int projectCollectionsObjectIndex, string collectionName, string collectionType, string collectionBannerUri) + private async Task UpdateProjectCollectionsDisplay(int projectCollectionsObjectIndex, string collectionName, string collectionType, string collectionBannerUri) { + //Debug.Log($"COLLECTION TYPE: {collectionType}"); string[] textObjectNames = { "NameText", "TypeText" }; string[] textValues = { collectionName, collectionType }; for (int i = 0; i < textObjectNames.Length; i++) @@ -251,8 +244,13 @@ private async void UpdateProjectCollectionsDisplay(int projectCollectionsObjectI /// Nft name. /// Nft supply. /// Nft Uri. - private async void UpdateCollectionItemDisplay(string collectionContract, int collectionObjectIndex, string nftId, string nftType, string nftSupply, string nftUri) + private async Task UpdateCollectionItemDisplay(string collectionContract, int collectionObjectIndex, string nftId, string nftType, string nftSupply, string nftUri) { + //Debug.Log($"NFT TYPE: {nftType}"); + if (nftType == "") + { + Debug.Log($"NFTID: {nftId} from collection contract {collectionContract} has no type"); + } string[] textObjectNames = { "IdText", "TypeText", "SupplyText" }; string[] textValues = { $"ID: {nftId}", nftType, $"Supply: {nftSupply}"}; for (int i = 0; i < textObjectNames.Length; i++) diff --git a/src/UnitySampleProject/Assets/Samples/web3.unity SDK Marketplace/2.6.1/Marketplace Samples/Scripts/BrowseMarketplaceManager.cs b/src/UnitySampleProject/Assets/Samples/web3.unity SDK Marketplace/2.6.1/Marketplace Samples/Scripts/BrowseMarketplaceManager.cs index 3347ce295..706aefcdb 100644 --- a/src/UnitySampleProject/Assets/Samples/web3.unity SDK Marketplace/2.6.1/Marketplace Samples/Scripts/BrowseMarketplaceManager.cs +++ b/src/UnitySampleProject/Assets/Samples/web3.unity SDK Marketplace/2.6.1/Marketplace Samples/Scripts/BrowseMarketplaceManager.cs @@ -68,11 +68,11 @@ private async void GetProjectMarketplaces() /// /// Populates marketplaces and adds them to the display panel. /// - private void PopulateMarketplaces(UnityPackage.Model.MarketplaceModel.ProjectMarketplacesResponse marketplacesResponse) + private async void PopulateMarketplaces(UnityPackage.Model.MarketplaceModel.ProjectMarketplacesResponse marketplacesResponse) { foreach (var marketplace in marketplacesResponse.Marketplaces) { - AddMarketplaceToDisplay(marketplace.contract_address, marketplace.name, baseUrl + marketplace.banner); + await AddMarketplaceToDisplay(marketplace.contract_address, marketplace.name, baseUrl + marketplace.banner); } EventManagerMarketplace.RaiseToggleProcessingMenu(); } @@ -93,7 +93,7 @@ private async void PopulateMarketplaceItems(string marketplaceContract, int inde var response = await EvmMarketplace.GetMarketplaceItems(projectResponse.items[index].marketplace_id); foreach (var item in response.items) { - AddMarketplaceItemToDisplay(marketplaceContract, item.id, item.token.token_type, item.price, item.token.uri); + await AddMarketplaceItemToDisplay(marketplaceContract, item.id, item.token.token_type, item.price, item.token.uri); } EventManagerMarketplace.RaiseToggleProcessingMenu(); } @@ -104,7 +104,7 @@ private async void PopulateMarketplaceItems(string marketplaceContract, int inde /// Marketplace contract the item belongs to. /// Marketplace name to add. /// Marketplace image uri to add. - private void AddMarketplaceToDisplay(string marketplaceContract, string marketplaceName, string marketplaceBannerUri) + private async Task AddMarketplaceToDisplay(string marketplaceContract, string marketplaceName, string marketplaceBannerUri) { if (projectMarketplacesObjectNumber >= projectMarketplacesDisplayCount) { @@ -114,12 +114,12 @@ private void AddMarketplaceToDisplay(string marketplaceContract, string marketpl projectMarketplacesPrefabs[i - 1] = projectMarketplacesPrefabs[i]; } projectMarketplacesPrefabs[projectMarketplacesPrefabs.Length - 1] = Instantiate(projectMarketplacesPrefab, marketplacePanel.transform); - UpdateProjectMarketplacesDisplay(marketplaceContract, projectMarketplacesObjectNumber, marketplaceName, marketplaceBannerUri); + await UpdateProjectMarketplacesDisplay(marketplaceContract, projectMarketplacesObjectNumber, marketplaceName, marketplaceBannerUri); } else { projectMarketplacesPrefabs[projectMarketplacesObjectNumber] = Instantiate(projectMarketplacesPrefab, marketplacePanel.transform); - UpdateProjectMarketplacesDisplay(marketplaceContract, projectMarketplacesObjectNumber, marketplaceName, marketplaceBannerUri); + await UpdateProjectMarketplacesDisplay(marketplaceContract, projectMarketplacesObjectNumber, marketplaceName, marketplaceBannerUri); } projectMarketplacesObjectNumber++; marketplaceScrollRect.horizontalNormalizedPosition = 0; @@ -133,7 +133,7 @@ private void AddMarketplaceToDisplay(string marketplaceContract, string marketpl /// Nft name. /// Nft price. /// Nft Uri. - private void AddMarketplaceItemToDisplay(string marketplaceContract, string nftId, string nftType, string nftPrice, string nftUri) + private async Task AddMarketplaceItemToDisplay(string marketplaceContract, string nftId, string nftType, string nftPrice, string nftUri) { if (marketplaceItemObjectNumber >= marketplaceItemDisplayCount) { @@ -143,12 +143,12 @@ private void AddMarketplaceItemToDisplay(string marketplaceContract, string nftI marketplaceItemPrefabs[i - 1] = marketplaceItemPrefabs[i]; } marketplaceItemPrefabs[marketplaceItemPrefabs.Length - 1] = Instantiate(marketplaceItemPrefab, marketplacePanel.transform); - UpdateMarketplaceItemDisplay(marketplaceContract, marketplaceItemObjectNumber, nftId, nftType, nftPrice, nftUri); + await UpdateMarketplaceItemDisplay(marketplaceContract, marketplaceItemObjectNumber, nftId, nftType, nftPrice, nftUri); } else { marketplaceItemPrefabs[marketplaceItemObjectNumber] = Instantiate(marketplaceItemPrefab, marketplacePanel.transform); - UpdateMarketplaceItemDisplay(marketplaceContract, marketplaceItemObjectNumber, nftId, nftType, nftPrice, nftUri); + await UpdateMarketplaceItemDisplay(marketplaceContract, marketplaceItemObjectNumber, nftId, nftType, nftPrice, nftUri); } marketplaceItemObjectNumber++; marketplaceScrollRect.horizontalNormalizedPosition = 0; @@ -177,7 +177,7 @@ private async Task ImportTexture(string uri) /// Index of marketplace. /// Marketplace name. /// Marketplace Uri. - private async void UpdateProjectMarketplacesDisplay(string marketplaceContract, int projectMarketplacesObjectIndex, string marketplaceName, string marketplaceBannerUri) + private async Task UpdateProjectMarketplacesDisplay(string marketplaceContract, int projectMarketplacesObjectIndex, string marketplaceName, string marketplaceBannerUri) { string[] textObjectNames = { "NameText" }; string[] textValues = { marketplaceName }; @@ -214,7 +214,7 @@ private async void UpdateProjectMarketplacesDisplay(string marketplaceContract, /// Nft name. /// Nft price. /// Nft Uri. - private async void UpdateMarketplaceItemDisplay(string marketplaceContract, int marketplaceItemObjectIndex, string nftId, string nftType, string nftPrice, string nftUri) + private async Task UpdateMarketplaceItemDisplay(string marketplaceContract, int marketplaceItemObjectIndex, string nftId, string nftType, string nftPrice, string nftUri) { var ethValue = (decimal)BigInteger.Parse(nftPrice) / (decimal)BigInteger.Pow(10, 18); string formattedEthValue = ethValue.ToString("0.##################"); diff --git a/src/UnitySampleProject/Assets/Samples/web3.unity SDK Marketplace/2.6.1/Marketplace Samples/Scripts/CreateCollectionManager.cs b/src/UnitySampleProject/Assets/Samples/web3.unity SDK Marketplace/2.6.1/Marketplace Samples/Scripts/CreateCollectionManager.cs index 4fcf1f70f..ccf803843 100644 --- a/src/UnitySampleProject/Assets/Samples/web3.unity SDK Marketplace/2.6.1/Marketplace Samples/Scripts/CreateCollectionManager.cs +++ b/src/UnitySampleProject/Assets/Samples/web3.unity SDK Marketplace/2.6.1/Marketplace Samples/Scripts/CreateCollectionManager.cs @@ -1,3 +1,4 @@ +using System; using ChainSafe.Gaming.Web3; using TMPro; using UnityEngine; @@ -55,11 +56,21 @@ public async void Create721Collection(string collectionName721, string collectio { var response = await EvmMarketplace.Create721Collection(BearerToken, collectionName721, collectionDescription721, collectionMintingPublic721); Debug.Log($"TX: {response.TransactionHash}"); + processing = false; } - catch (Web3Exception e) + catch (Exception e) { processing = false; - Debug.Log($"Creation failed: {e}"); + switch (e) + { + case Web3Exception web3Ex: + Debug.Log($"Web3 exception: {web3Ex}"); + break; + + default: + Debug.Log($"Creation failed: {e}"); + break; + } } } @@ -72,11 +83,21 @@ public async void Create1155Collection(string collectionName1155, string collect { var response = await EvmMarketplace.Create1155Collection(BearerToken, collectionName1155, collectionDescription1155, collectionMintingPublic1155); Debug.Log($"TX: {response.TransactionHash}"); + processing = false; } - catch (Web3Exception e) + catch (Exception e) { processing = false; - Debug.Log($"Creation failed: {e}"); + switch (e) + { + case Web3Exception web3Ex: + Debug.Log($"Web3 exception: {web3Ex}"); + break; + + default: + Debug.Log($"Creation failed: {e}"); + break; + } } } diff --git a/src/UnitySampleProject/Assets/Samples/web3.unity SDK Marketplace/2.6.1/Marketplace Samples/Scripts/CreateMarketplaceManager.cs b/src/UnitySampleProject/Assets/Samples/web3.unity SDK Marketplace/2.6.1/Marketplace Samples/Scripts/CreateMarketplaceManager.cs index 6c728b648..64073d42d 100644 --- a/src/UnitySampleProject/Assets/Samples/web3.unity SDK Marketplace/2.6.1/Marketplace Samples/Scripts/CreateMarketplaceManager.cs +++ b/src/UnitySampleProject/Assets/Samples/web3.unity SDK Marketplace/2.6.1/Marketplace Samples/Scripts/CreateMarketplaceManager.cs @@ -1,3 +1,4 @@ +using System; using ChainSafe.Gaming.Web3; using TMPro; using UnityEngine; @@ -47,12 +48,17 @@ public async void CreateMarketplace(string marketplaceName, string marketplaceDe var response = await EvmMarketplace.CreateMarketplace(BearerToken, marketplaceName, marketplaceDescription, marketplaceWhiteListing); Debug.Log($"TX: {response.TransactionHash}"); EventManagerMarketplace.RaiseCreateMarketplace(); + processing = false; } catch (Web3Exception e) { processing = false; Debug.Log($"Creation failed: {e}"); } + catch (Exception) + { + processing = false; + } } /// diff --git a/src/UnitySampleProject/Assets/Samples/web3.unity SDK Marketplace/2.6.1/Marketplace Samples/Scripts/EventManagerMarketplace.cs b/src/UnitySampleProject/Assets/Samples/web3.unity SDK Marketplace/2.6.1/Marketplace Samples/Scripts/EventManagerMarketplace.cs index 0c52e61c1..f8d24f10a 100644 --- a/src/UnitySampleProject/Assets/Samples/web3.unity SDK Marketplace/2.6.1/Marketplace Samples/Scripts/EventManagerMarketplace.cs +++ b/src/UnitySampleProject/Assets/Samples/web3.unity SDK Marketplace/2.6.1/Marketplace Samples/Scripts/EventManagerMarketplace.cs @@ -310,7 +310,7 @@ private static void ResetBearerTokens() var listNftToMarketplaceCreateEventArgs = new ListNftToMarketplaceConfigEventArgs(string.Empty); RaiseConfigureListNftToMarketplaceManager(listNftToMarketplaceCreateEventArgs); - var mintCollectionNftConfigEventArgs = new MintCollectionNftConfigEventArgs(string.Empty, string.Empty); + var mintCollectionNftConfigEventArgs = new MintCollectionNftConfigEventArgs(string.Empty, string.Empty, string.Empty); RaiseMintCollectionNftManager(mintCollectionNftConfigEventArgs); } @@ -550,15 +550,20 @@ public class MintCollectionNftConfigEventArgs : EventArgs public string BearerToken { get; private set; } public string CollectionContractToListFrom { get; private set; } + public string CollectionTypeToListFrom { get; private set; } #endregion #region Methods - public MintCollectionNftConfigEventArgs(string bearerToken, string collectionToListFrom) + public MintCollectionNftConfigEventArgs(string bearerToken, string collectionToListFrom, string collectionTypeToListFrom) { - BearerToken = bearerToken; + if (bearerToken != null) + { + BearerToken = bearerToken; + } CollectionContractToListFrom = collectionToListFrom; + CollectionTypeToListFrom = collectionTypeToListFrom; } #endregion diff --git a/src/UnitySampleProject/Assets/Samples/web3.unity SDK Marketplace/2.6.1/Marketplace Samples/Scripts/ListNftToMarketplaceManager.cs b/src/UnitySampleProject/Assets/Samples/web3.unity SDK Marketplace/2.6.1/Marketplace Samples/Scripts/ListNftToMarketplaceManager.cs index 11593c3bc..1ba0667da 100644 --- a/src/UnitySampleProject/Assets/Samples/web3.unity SDK Marketplace/2.6.1/Marketplace Samples/Scripts/ListNftToMarketplaceManager.cs +++ b/src/UnitySampleProject/Assets/Samples/web3.unity SDK Marketplace/2.6.1/Marketplace Samples/Scripts/ListNftToMarketplaceManager.cs @@ -1,5 +1,7 @@ +using System; using System.Collections.Generic; using System.Threading.Tasks; +using ChainSafe.Gaming.Web3; using TMPro; using UnityEngine; using EvmMarketplace = Scripts.EVM.Marketplace.Marketplace; @@ -17,6 +19,7 @@ public class ListNftToMarketplaceManager : MonoBehaviour [SerializeField] private TMP_InputField amountInput; [SerializeField] private TMP_Dropdown selectMarketplaceDropDown; private UnityPackage.Model.MarketplaceModel.ProjectMarketplacesResponse marketplaceList; + private bool processing; #endregion @@ -73,8 +76,28 @@ private void OnDropdownValueChanged(int index) /// private async void ListNftToMarketplace() { - await ApproveListNftsToMarketplace(CollectionContractToListFrom, MarketplaceContractToListTo, NftType); - await ListNftsToMarketplace(MarketplaceContractToListTo, CollectionContractToListFrom, TokenIdToList, priceInput.text); + if (processing) return; + processing = true; + try + { + await ApproveListNftsToMarketplace(CollectionContractToListFrom, MarketplaceContractToListTo, NftType); + await ListNftsToMarketplace(MarketplaceContractToListTo, CollectionContractToListFrom, TokenIdToList, priceInput.text); + processing = false; + } + catch (Exception e) + { + processing = false; + switch (e) + { + case Web3Exception web3Ex: + Debug.Log($"Web3 exception: {web3Ex}"); + break; + + default: + Debug.Log($"Listing failed: {e}"); + break; + } + } } /// diff --git a/src/UnitySampleProject/Assets/Samples/web3.unity SDK Marketplace/2.6.1/Marketplace Samples/Scripts/LoginManagerMarketplace.cs b/src/UnitySampleProject/Assets/Samples/web3.unity SDK Marketplace/2.6.1/Marketplace Samples/Scripts/LoginManagerMarketplace.cs index c82ca217a..add9eb032 100644 --- a/src/UnitySampleProject/Assets/Samples/web3.unity SDK Marketplace/2.6.1/Marketplace Samples/Scripts/LoginManagerMarketplace.cs +++ b/src/UnitySampleProject/Assets/Samples/web3.unity SDK Marketplace/2.6.1/Marketplace Samples/Scripts/LoginManagerMarketplace.cs @@ -176,7 +176,7 @@ private async void TryLogin(string authResponseToken) EventManagerMarketplace.RaiseConfigureCollectionCreateManager(collectionCreateConfigArgs); var listNftToMarketplaceCreateConfigArgs = new EventManagerMarketplace.ListNftToMarketplaceConfigEventArgs(loginResponse.access_token.token); EventManagerMarketplace.RaiseConfigureListNftToMarketplaceManager(listNftToMarketplaceCreateConfigArgs); - var mintCollectionNftConfigArgs = new EventManagerMarketplace.MintCollectionNftConfigEventArgs(loginResponse.access_token.token, null); + var mintCollectionNftConfigArgs = new EventManagerMarketplace.MintCollectionNftConfigEventArgs(loginResponse.access_token.token, null, null); EventManagerMarketplace.RaiseMintCollectionNftManager(mintCollectionNftConfigArgs); } } diff --git a/src/UnitySampleProject/Assets/Samples/web3.unity SDK Marketplace/2.6.1/Marketplace Samples/Scripts/MintCollectionNftManager.cs b/src/UnitySampleProject/Assets/Samples/web3.unity SDK Marketplace/2.6.1/Marketplace Samples/Scripts/MintCollectionNftManager.cs index 5fca16256..53de724e6 100644 --- a/src/UnitySampleProject/Assets/Samples/web3.unity SDK Marketplace/2.6.1/Marketplace Samples/Scripts/MintCollectionNftManager.cs +++ b/src/UnitySampleProject/Assets/Samples/web3.unity SDK Marketplace/2.6.1/Marketplace Samples/Scripts/MintCollectionNftManager.cs @@ -13,7 +13,6 @@ public class MintCollectionNftManager : MonoBehaviour { #region Fields - [SerializeField] private TMP_Dropdown typeDropDown; [SerializeField] private TMP_InputField nameInput; [SerializeField] private TMP_InputField descriptionInput; [SerializeField] private TMP_InputField amountInput; @@ -24,6 +23,7 @@ public class MintCollectionNftManager : MonoBehaviour #region Properties private string CollectionContractToListFrom { get; set; } + private string CollectionTypeToListFrom { get; set; } private string BearerToken { get; set; } #endregion @@ -37,19 +37,24 @@ private void UploadNftImage() { if (processing) return; processing = true; - nameInput.text ??= " "; - descriptionInput.text ??= " "; - switch (typeDropDown.options[typeDropDown.value].text) + if (amountInput.text == "") { - case "721": + amountInput.text = "1"; + } + Debug.Log($"TYPE: {CollectionTypeToListFrom}"); + switch (CollectionTypeToListFrom) + { + case "ERC721": Mint721CollectionNft(BearerToken, CollectionContractToListFrom, nameInput.text, descriptionInput.text); break; - case "1155": + case "ERC1155": Mint1155CollectionNft(BearerToken, CollectionContractToListFrom, nameInput.text, amountInput.text, descriptionInput.text); break; + default: + throw new Exception($"Type not valid: {CollectionTypeToListFrom}"); } } - + /// /// Mints an NFT to a 721 collection /// @@ -59,14 +64,24 @@ public async void Mint721CollectionNft(string bearerToken, string collectionCont { var response = await EvmMarketplace.Mint721CollectionNft(bearerToken, collectionContract721, name721, description721); Debug.Log($"TX: {response.TransactionHash}"); + processing = false; } - catch (Web3Exception e) + catch (Exception e) { processing = false; - Debug.Log($"Minting failed: {e}"); + switch (e) + { + case Web3Exception web3Ex: + Debug.Log($"Web3 exception: {web3Ex}"); + break; + + default: + Debug.Log($"Minting failed: {e}"); + break; + } } } - + /// /// Mints an NFT to a 1155 collection /// @@ -74,13 +89,23 @@ public async void Mint1155CollectionNft(string bearerToken, string collectionCon { try { - var response = await EvmMarketplace.Mint1155CollectionNft(bearerToken, collectionContract1155, name1155, amount1155, description1155); + var response = await EvmMarketplace.Mint1155CollectionNft(bearerToken, collectionContract1155, amount1155, name1155, description1155); Debug.Log($"TX: {response.TransactionHash}"); + processing = false; } - catch (Web3Exception e) + catch (Exception e) { processing = false; - Debug.Log($"Minting failed: {e}"); + switch (e) + { + case Web3Exception web3Ex: + Debug.Log($"Web3 exception: {web3Ex}"); + break; + + default: + Debug.Log($"Minting failed: {e}"); + break; + } } } @@ -114,6 +139,18 @@ private void OnConfigureMintCollectionNftManager(object sender, EventManagerMark BearerToken = mintCollectionNftConfigEventArgs.BearerToken; } CollectionContractToListFrom = mintCollectionNftConfigEventArgs.CollectionContractToListFrom; + CollectionTypeToListFrom = mintCollectionNftConfigEventArgs.CollectionTypeToListFrom; + switch (mintCollectionNftConfigEventArgs.CollectionTypeToListFrom) + { + case "ERC721": + Debug.Log("DISABLING AMOUNT INPUT"); + amountInput.gameObject.SetActive(false); + break; + case "ERC1155": + Debug.Log("ENABLING AMOUNT INPUT"); + amountInput.gameObject.SetActive(true); + break; + } } #endregion