diff --git a/CHANGELOG.md b/CHANGELOG.md index 96990089..ccc9b628 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,13 +5,18 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [2.0.3] - 2023-08-01 +### Changed +- Mint button in inventory rolled back to old behaviour that uses contracts on view +- Added Mint FA2 Token button on welcome screen +- Removed upload file feature usage from DemoExample sample + ## [2.0.2] - 2023-07-28 ### Fixed - WebGL `GetActiveAccountAddress` function. - ## [2.0.1] - 2023-07-28 ### Fixed - NftApi sample bug with incorrect key error. @@ -134,7 +139,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added auto releases with GH actions -[unreleased]: https://github.com/trilitech/tezos-unity-sdk/compare/2.0.2...HEAD +[unreleased]: https://github.com/trilitech/tezos-unity-sdk/compare/2.0.3...HEAD +[2.0.3]: https://github.com/trilitech/tezos-unity-sdk/releases/tag/2.0.3 [2.0.2]: https://github.com/trilitech/tezos-unity-sdk/releases/tag/2.0.2 [2.0.1]: https://github.com/trilitech/tezos-unity-sdk/releases/tag/2.0.1 [2.0.0]: https://github.com/trilitech/tezos-unity-sdk/releases/tag/2.0.0 diff --git a/Runtime/Scripts/Tezos/Wallet/WalletProvider.cs b/Runtime/Scripts/Tezos/Wallet/WalletProvider.cs index 68b3592a..56a82a0d 100644 --- a/Runtime/Scripts/Tezos/Wallet/WalletProvider.cs +++ b/Runtime/Scripts/Tezos/Wallet/WalletProvider.cs @@ -76,13 +76,6 @@ private void InitBeaconConnector() // we should rewrite the Beacon connector to be coroutine compatible. private IEnumerator OnOpenWallet(bool withRedirectToWallet) { - var address = _beaconConnector.GetActiveAccountAddress(); - if (!string.IsNullOrEmpty(address)) - { - // Active address, let's disconnect it - _beaconConnector.DisconnectAccount(); - yield return new WaitForSeconds(2.5f); - } if (string.IsNullOrEmpty(_handshake)) { //No handshake, Waiting for handshake... diff --git a/Samples~/Scenes/Demo Example.unity b/Samples~/Scenes/Demo Example.unity index 9819096e..fbb0be00 100644 --- a/Samples~/Scenes/Demo Example.unity +++ b/Samples~/Scenes/Demo Example.unity @@ -104,7 +104,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +117,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -165,7 +165,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1097546698} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -323,11 +322,10 @@ RectTransform: m_Children: - {fileID: 394790659} m_Father: {fileID: 4576560578601734406} - 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: 309.6043, y: -680.6813} + m_AnchoredPosition: {x: 309.6043, y: -408.98645} m_SizeDelta: {x: 248.1163, y: 89.2032} m_Pivot: {x: 0.5, y: 0.6} --- !u!114 &166806035 @@ -455,7 +453,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2120282810} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -534,7 +531,6 @@ RectTransform: m_Children: - {fileID: 2120282810} m_Father: {fileID: 1335878711} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.19373876, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -627,7 +623,6 @@ RectTransform: m_Children: - {fileID: 1287982186} m_Father: {fileID: 2259280969041505542} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -771,7 +766,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 166806034} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -907,7 +901,6 @@ RectTransform: m_Children: - {fileID: 1158432125} m_Father: {fileID: 875485990} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -983,7 +976,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 875485990} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1059,7 +1051,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1061548246} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1201,13 +1192,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 519783458} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 470.00955, y: 276.10757, z: -4.8670645} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &519783462 MonoBehaviour: @@ -1308,13 +1299,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 527547394} + serializedVersion: 2 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: 0} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &551888377 GameObject: @@ -1388,7 +1379,6 @@ RectTransform: - {fileID: 4576560578601734406} - {fileID: 2259280969041505542} m_Father: {fileID: 1335878711} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.19373876, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1428,7 +1418,6 @@ RectTransform: m_Children: - {fileID: 1097546698} m_Father: {fileID: 1158432125} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1571,6 +1560,139 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 566963215} m_CullTransparentMesh: 1 +--- !u!1 &580179709 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 580179710} + - component: {fileID: 580179713} + - component: {fileID: 580179712} + - component: {fileID: 580179711} + m_Layer: 5 + m_Name: MintFa2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &580179710 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 580179709} + 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: 1103132089} + m_Father: {fileID: 2259280969041505542} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 130.03426, y: -331.77902} + m_SizeDelta: {x: 160, y: 45.778} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &580179711 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 580179709} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 580179712} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 8370309638320884684} + m_TargetAssemblyTypeName: TezosSDK.Samples.DemoExample.RegisterPanel, Assembly-CSharp + m_MethodName: MintFA2 + 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 +--- !u!114 &580179712 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 580179709} + 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: 21300000, guid: 485cd2ab0486a8e4aaa55e94ec27c6b6, type: 3} + 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!222 &580179713 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 580179709} + m_CullTransparentMesh: 1 --- !u!1 &618776569 GameObject: m_ObjectHideFlags: 0 @@ -1602,7 +1724,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1878775306} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1737,7 +1858,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1848828471} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1876,7 +1996,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1186911593} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2011,7 +2130,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1996004912} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -2150,7 +2268,6 @@ RectTransform: - {fileID: 449307339} - {fileID: 2105008798} m_Father: {fileID: 1855521413} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2193,7 +2310,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1467783616} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2330,7 +2446,6 @@ RectTransform: m_Children: - {fileID: 517709824} m_Father: {fileID: 1848828471} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -2463,7 +2578,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1097546698} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2619,7 +2733,6 @@ RectTransform: - {fileID: 1073020257} - {fileID: 38929832} m_Father: {fileID: 566963216} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2640,6 +2753,140 @@ MonoBehaviour: m_EditorClassIdentifier: m_Padding: {x: -8, y: -5, z: -8, w: -5} m_Softness: {x: 0, y: 0} +--- !u!1 &1103132088 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1103132089} + - component: {fileID: 1103132091} + - component: {fileID: 1103132090} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1103132089 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1103132088} + 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: 580179710} + 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!114 &1103132090 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1103132088} + 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: MINT FA2 TOKEN + 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: 12 + m_fontSizeBase: 12 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + 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!222 &1103132091 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1103132088} + m_CullTransparentMesh: 1 --- !u!1 &1158432124 GameObject: m_ObjectHideFlags: 0 @@ -2673,7 +2920,6 @@ RectTransform: - {fileID: 566963216} - {fileID: 1878775306} m_Father: {fileID: 449307339} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2750,7 +2996,6 @@ RectTransform: m_Children: - {fileID: 714021813} m_Father: {fileID: 875485990} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2856,9 +3101,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -2892,13 +3145,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1242404407} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1287982185 GameObject: @@ -2931,7 +3184,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 385585590} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3068,7 +3320,6 @@ RectTransform: - {fileID: 1233252303} - {fileID: 91183861} m_Father: {fileID: 875485990} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3108,7 +3359,6 @@ RectTransform: m_Children: - {fileID: 946761273} m_Father: {fileID: 2259280969041505542} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -3251,7 +3501,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2105008798} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3340,7 +3589,6 @@ RectTransform: - {fileID: 630597467} - {fileID: 1061548246} m_Father: {fileID: 2105008798} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3461,7 +3709,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -3479,7 +3729,6 @@ RectTransform: m_Children: - {fileID: 875485990} m_Father: {fileID: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -3519,7 +3768,6 @@ RectTransform: m_Children: - {fileID: 618776570} m_Father: {fileID: 1158432125} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -3653,7 +3901,6 @@ RectTransform: m_Children: - {fileID: 863998677} m_Father: {fileID: 2120282810} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -3799,7 +4046,6 @@ RectTransform: - {fileID: 1848828471} - {fileID: 1766831130} m_Father: {fileID: 875485990} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3875,7 +4121,6 @@ RectTransform: - {fileID: 204539195} - {fileID: 1996004912} m_Father: {fileID: 343462376} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -3895,7 +4140,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2259280969041505542} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -3915,11 +4159,10 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4576560578601734406} - 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: 309.6043, y: -512} + m_AnchoredPosition: {x: 309.6043, y: -240.30519} m_SizeDelta: {x: 256, y: 256} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &87297206388748439 @@ -4041,7 +4284,6 @@ RectTransform: m_Children: - {fileID: 4835788164799164912} m_Father: {fileID: 2259280969041505542} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -4063,7 +4305,6 @@ RectTransform: - {fileID: 2173917586599625235} - {fileID: 2872049062269359583} m_Father: {fileID: 2157167984635903687} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -4075,6 +4316,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1335878711} m_Modifications: - target: {fileID: 90632140526098584, guid: fea24843cafc10f4a80e81e279e6fb59, type: 3} @@ -5378,6 +5620,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fea24843cafc10f4a80e81e279e6fb59, type: 3} --- !u!114 &961944403666105661 MonoBehaviour: @@ -5556,7 +5801,6 @@ RectTransform: - {fileID: 8394639952592600258} - {fileID: 4477773783203599571} m_Father: {fileID: 6711944270315204328} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -5638,7 +5882,6 @@ RectTransform: m_Children: - {fileID: 595204398230456647} m_Father: {fileID: 4576560578601734406} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -5658,7 +5901,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 595204398230456647} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -5701,14 +5943,14 @@ RectTransform: - {fileID: 591608973198919699} - {fileID: 1467783616} - {fileID: 385585590} + - {fileID: 580179710} - {fileID: 5411474954289112801} m_Father: {fileID: 551888380} - m_RootOrder: 1 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: 0} - m_SizeDelta: {x: 260.0685, y: 170} + m_SizeDelta: {x: 260.0685, y: 215} m_Pivot: {x: 0.5, y: 0} --- !u!1 &2488490516731229458 GameObject: @@ -5889,7 +6131,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 595204398230456647} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -5901,6 +6142,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 875485990} m_Modifications: - target: {fileID: 3028198139798058032, guid: 7446bf7afc73cea489f7f2f5aa2b5b3d, type: 3} @@ -6072,6 +6314,9 @@ PrefabInstance: value: -29.069946 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7446bf7afc73cea489f7f2f5aa2b5b3d, type: 3} --- !u!114 &3028198140820506503 stripped MonoBehaviour: @@ -6367,7 +6612,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1445790741829049319} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -6527,7 +6771,6 @@ RectTransform: - {fileID: 77346752442359449} - {fileID: 166806034} m_Father: {fileID: 551888380} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.02, y: 0.02} m_AnchorMax: {x: 0.98, y: 0.98} @@ -6636,7 +6879,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 591608973198919699} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -6867,7 +7109,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5411474954289112801} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -6888,7 +7129,6 @@ RectTransform: m_Children: - {fileID: 5409969550976114818} m_Father: {fileID: 2259280969041505542} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -7092,11 +7332,10 @@ RectTransform: m_Children: - {fileID: 8587265902301650825} m_Father: {fileID: 4576560578601734406} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 309.6043, y: -343.31873} + m_AnchoredPosition: {x: 309.6043, y: -71.62391} m_SizeDelta: {x: 248.1163, y: 89.2032} m_Pivot: {x: 0.5, y: 0.4} --- !u!1 &6130628441484055059 @@ -7290,7 +7529,6 @@ RectTransform: m_Children: - {fileID: 1445790741829049319} m_Father: {fileID: 4576560578601734406} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -7501,7 +7739,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8428389295711479764} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -7827,7 +8064,6 @@ RectTransform: m_Children: - {fileID: 8484262699595205458} m_Father: {fileID: 2259280969041505542} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -7915,7 +8151,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1445790741829049319} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -7936,7 +8171,6 @@ RectTransform: m_Children: - {fileID: 7386669408190701489} m_Father: {fileID: 2259280969041505542} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -7975,7 +8209,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7869881885888979496} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -7995,7 +8228,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6076478647547554052} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -8045,6 +8277,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1335878711} m_Modifications: - target: {fileID: 196571834, guid: e498629a470d8da42a969e517cfe84ba, type: 3} @@ -8225,7 +8458,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 430090045836270011, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 430090045836270011, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -8233,7 +8466,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 430090045836270011, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -308.71115 + value: -206.61314 objectReference: {fileID: 0} - target: {fileID: 637677193177753482, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -8249,7 +8482,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 637677193177753482, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 637677193177753482, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -8257,7 +8490,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 637677193177753482, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -376.31363 + value: -251.52718 objectReference: {fileID: 0} - target: {fileID: 718822117714551310, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -8273,7 +8506,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 718822117714551310, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 718822117714551310, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -8281,7 +8514,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 718822117714551310, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -241.10867 + value: -161.69911 objectReference: {fileID: 0} - target: {fileID: 725472571304535529, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y @@ -8301,7 +8534,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 851301467594664582, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 851301467594664582, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -8309,7 +8542,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 851301467594664582, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -308.71115 + value: -206.61314 objectReference: {fileID: 0} - target: {fileID: 1127264559751325516, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -8325,7 +8558,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1127264559751325516, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 1127264559751325516, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -8333,7 +8566,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1127264559751325516, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -105.90372 + value: -71.87105 objectReference: {fileID: 0} - target: {fileID: 1225645404772214731, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -8349,7 +8582,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1225645404772214731, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 1225645404772214731, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -8357,7 +8590,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1225645404772214731, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -376.31363 + value: -251.52718 objectReference: {fileID: 0} - target: {fileID: 1243736299092533678, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -8373,7 +8606,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1243736299092533678, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 1243736299092533678, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -8381,7 +8614,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1243736299092533678, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -376.31363 + value: -251.52718 objectReference: {fileID: 0} - target: {fileID: 1320321083576362155, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -8397,7 +8630,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1320321083576362155, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 1320321083576362155, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -8405,7 +8638,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1320321083576362155, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -241.10867 + value: -161.69911 objectReference: {fileID: 0} - target: {fileID: 1717545443334981972, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -8421,7 +8654,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1717545443334981972, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 1717545443334981972, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -8429,7 +8662,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1717545443334981972, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -241.10867 + value: -161.69911 objectReference: {fileID: 0} - target: {fileID: 1832333071734352274, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -8445,7 +8678,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1832333071734352274, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 1832333071734352274, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -8453,7 +8686,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1832333071734352274, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -173.5062 + value: -116.78508 objectReference: {fileID: 0} - target: {fileID: 1923574325239292056, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -8469,7 +8702,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1923574325239292056, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 1923574325239292056, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -8477,7 +8710,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1923574325239292056, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -241.10867 + value: -161.69911 objectReference: {fileID: 0} - target: {fileID: 1952142993510825865, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -8493,7 +8726,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1952142993510825865, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 1952142993510825865, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -8501,7 +8734,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1952142993510825865, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -241.10867 + value: -161.69911 objectReference: {fileID: 0} - target: {fileID: 2181053491720742794, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -8517,7 +8750,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2181053491720742794, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 2181053491720742794, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -8525,7 +8758,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2181053491720742794, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -105.90372 + value: -71.87105 objectReference: {fileID: 0} - target: {fileID: 2300476803052676545, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -8541,7 +8774,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2300476803052676545, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 2300476803052676545, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -8549,7 +8782,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2300476803052676545, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -511.5186 + value: -341.35522 objectReference: {fileID: 0} - target: {fileID: 2543365467005831827, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -8589,7 +8822,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2611099924439782927, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 2611099924439782927, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -8597,7 +8830,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2611099924439782927, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -511.5186 + value: -341.35522 objectReference: {fileID: 0} - target: {fileID: 2663130240397400945, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -8613,7 +8846,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2663130240397400945, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 2663130240397400945, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -8621,7 +8854,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2663130240397400945, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -105.90372 + value: -71.87105 objectReference: {fileID: 0} - target: {fileID: 2694009290826676875, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -8637,7 +8870,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2694009290826676875, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 2694009290826676875, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -8645,7 +8878,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2694009290826676875, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -308.71115 + value: -206.61314 objectReference: {fileID: 0} - target: {fileID: 3240801748702806111, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -8661,7 +8894,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3240801748702806111, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 3240801748702806111, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -8669,7 +8902,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3240801748702806111, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -173.5062 + value: -116.78508 objectReference: {fileID: 0} - target: {fileID: 3398024905494494449, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -8685,7 +8918,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3398024905494494449, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 3398024905494494449, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -8693,7 +8926,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3398024905494494449, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -443.9161 + value: -296.44122 objectReference: {fileID: 0} - target: {fileID: 3567024061939328633, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -8709,7 +8942,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3567024061939328633, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 3567024061939328633, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -8717,7 +8950,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3567024061939328633, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -376.31363 + value: -251.52718 objectReference: {fileID: 0} - target: {fileID: 3597517992495574710, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -8733,7 +8966,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3597517992495574710, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 3597517992495574710, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -8741,7 +8974,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3597517992495574710, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -105.90372 + value: -71.87105 objectReference: {fileID: 0} - target: {fileID: 3704987772616054139, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -8757,7 +8990,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3704987772616054139, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 3704987772616054139, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -8765,7 +8998,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3704987772616054139, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -38.30124 + value: -26.957016 objectReference: {fileID: 0} - target: {fileID: 3999310338079230606, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -8781,7 +9014,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3999310338079230606, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 3999310338079230606, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -8789,7 +9022,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3999310338079230606, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -443.9161 + value: -296.44122 objectReference: {fileID: 0} - target: {fileID: 4021288701622816932, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -8805,7 +9038,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4021288701622816932, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 4021288701622816932, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -8813,7 +9046,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4021288701622816932, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -511.5186 + value: -341.35522 objectReference: {fileID: 0} - target: {fileID: 4120484928213085471, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -8829,7 +9062,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4120484928213085471, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 4120484928213085471, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -8837,7 +9070,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4120484928213085471, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -241.10867 + value: -161.69911 objectReference: {fileID: 0} - target: {fileID: 4403076233473061044, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -8853,7 +9086,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4403076233473061044, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 4403076233473061044, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -8861,7 +9094,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4403076233473061044, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -511.5186 + value: -341.35522 objectReference: {fileID: 0} - target: {fileID: 4631593942007684583, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -8877,7 +9110,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4631593942007684583, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 4631593942007684583, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -8885,7 +9118,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4631593942007684583, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -443.9161 + value: -296.44122 objectReference: {fileID: 0} - target: {fileID: 4935654018284169604, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.x @@ -8933,7 +9166,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5008360562874404713, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 5008360562874404713, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -8941,7 +9174,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5008360562874404713, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -443.9161 + value: -296.44122 objectReference: {fileID: 0} - target: {fileID: 5025448437923247009, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -8957,7 +9190,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5025448437923247009, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 5025448437923247009, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -8965,7 +9198,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5025448437923247009, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -511.5186 + value: -341.35522 objectReference: {fileID: 0} - target: {fileID: 5296146945729432719, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -8981,7 +9214,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5296146945729432719, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 5296146945729432719, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -8989,7 +9222,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5296146945729432719, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -38.30124 + value: -26.957016 objectReference: {fileID: 0} - target: {fileID: 5471869585575087579, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -9005,7 +9238,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5471869585575087579, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 5471869585575087579, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -9013,7 +9246,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5471869585575087579, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -38.30124 + value: -26.957016 objectReference: {fileID: 0} - target: {fileID: 5756543420652473174, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -9029,7 +9262,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5756543420652473174, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 5756543420652473174, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -9037,7 +9270,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5756543420652473174, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -443.9161 + value: -296.44122 objectReference: {fileID: 0} - target: {fileID: 5843950661003434541, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y @@ -9061,7 +9294,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5958068534716496823, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 5958068534716496823, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -9069,7 +9302,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5958068534716496823, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -38.30124 + value: -26.957016 objectReference: {fileID: 0} - target: {fileID: 6322137153298442102, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -9085,7 +9318,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6322137153298442102, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 6322137153298442102, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -9093,7 +9326,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6322137153298442102, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -38.30124 + value: -26.957016 objectReference: {fileID: 0} - target: {fileID: 6478763895128696524, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -9109,7 +9342,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6478763895128696524, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 6478763895128696524, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -9117,7 +9350,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6478763895128696524, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -376.31363 + value: -251.52718 objectReference: {fileID: 0} - target: {fileID: 6636858857931946585, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y @@ -9141,7 +9374,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6725411246497768125, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 6725411246497768125, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -9149,7 +9382,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6725411246497768125, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -173.5062 + value: -116.78508 objectReference: {fileID: 0} - target: {fileID: 7097163516151263449, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -9165,7 +9398,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7097163516151263449, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 7097163516151263449, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -9173,7 +9406,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7097163516151263449, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -308.71115 + value: -206.61314 objectReference: {fileID: 0} - target: {fileID: 7386499288356640896, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -9189,7 +9422,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7386499288356640896, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 7386499288356640896, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -9197,7 +9430,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7386499288356640896, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -105.90372 + value: -71.87105 objectReference: {fileID: 0} - target: {fileID: 7405381337910620390, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -9213,7 +9446,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7405381337910620390, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 7405381337910620390, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -9221,7 +9454,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7405381337910620390, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -376.31363 + value: -251.52718 objectReference: {fileID: 0} - target: {fileID: 7695615537616820773, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -9237,7 +9470,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7695615537616820773, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 7695615537616820773, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -9245,7 +9478,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7695615537616820773, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -308.71115 + value: -206.61314 objectReference: {fileID: 0} - target: {fileID: 8046611456157246758, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -9261,7 +9494,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8046611456157246758, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 8046611456157246758, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -9269,7 +9502,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8046611456157246758, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -173.5062 + value: -116.78508 objectReference: {fileID: 0} - target: {fileID: 8226061382615317233, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -9285,7 +9518,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8226061382615317233, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 8226061382615317233, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -9293,7 +9526,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8226061382615317233, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -173.5062 + value: -116.78508 objectReference: {fileID: 0} - target: {fileID: 8331295094458047752, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -9309,7 +9542,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8331295094458047752, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 8331295094458047752, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -9317,7 +9550,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8331295094458047752, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -308.71115 + value: -206.61314 objectReference: {fileID: 0} - target: {fileID: 8488970251418149200, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -9333,7 +9566,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8488970251418149200, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 8488970251418149200, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -9341,7 +9574,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8488970251418149200, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -443.9161 + value: -296.44122 objectReference: {fileID: 0} - target: {fileID: 8518720227243822134, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -9357,7 +9590,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8518720227243822134, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 8518720227243822134, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -9365,7 +9598,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8518720227243822134, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -105.90372 + value: -71.87105 objectReference: {fileID: 0} - target: {fileID: 8532313233089284272, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -9381,7 +9614,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8532313233089284272, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 164.02937 + value: 99.53835 objectReference: {fileID: 0} - target: {fileID: 8532313233089284272, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -9389,7 +9622,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8532313233089284272, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -82.01469 + value: -49.769176 objectReference: {fileID: 0} - target: {fileID: 8550449784666909610, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -9405,7 +9638,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8550449784666909610, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 8550449784666909610, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -9413,7 +9646,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8550449784666909610, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -511.5186 + value: -341.35522 objectReference: {fileID: 0} - target: {fileID: 8850933835011160887, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchorMax.y @@ -9429,7 +9662,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8850933835011160887, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 8850933835011160887, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -9437,7 +9670,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8850933835011160887, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -173.5062 + value: -116.78508 objectReference: {fileID: 0} - target: {fileID: 8987413947129774216, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_Pivot.x @@ -9545,7 +9778,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8987413947741929569, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_SizeDelta.y - value: 62.602478 + value: 39.914032 objectReference: {fileID: 0} - target: {fileID: 8987413947741929569, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.x @@ -9553,7 +9786,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8987413947741929569, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y - value: -38.30124 + value: -26.957016 objectReference: {fileID: 0} - target: {fileID: 8987413948596207189, guid: e498629a470d8da42a969e517cfe84ba, type: 3} propertyPath: m_AnchoredPosition.y @@ -9592,6 +9825,9 @@ PrefabInstance: value: -42.679993 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e498629a470d8da42a969e517cfe84ba, type: 3} --- !u!222 &8990181027827715192 CanvasRenderer: @@ -9798,3 +10034,11 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1242404410} + - {fileID: 519783461} + - {fileID: 1855521413} + - {fileID: 527547397} diff --git a/Samples~/Scripts/DemoExample/Core/ExampleManager.cs b/Samples~/Scripts/DemoExample/Core/ExampleManager.cs index 3137019c..c4c5e5a9 100644 --- a/Samples~/Scripts/DemoExample/Core/ExampleManager.cs +++ b/Samples~/Scripts/DemoExample/Core/ExampleManager.cs @@ -51,7 +51,7 @@ public void FetchInventoryItems(Action> callback) var activeWalletAddress = Tezos.Wallet.GetActiveAddress(); // Address to the current active account const string entrypoint = "view_items_of"; - var input = new {@string = activeWalletAddress}; + var input = new { @string = activeWalletAddress }; CoroutineRunner.Instance.StartWrappedCoroutine( Tezos.API.ReadView( @@ -97,7 +97,7 @@ private void OnInventoryFetched(ContractInventoryViewResult[] inventory, Action< ); dummyItemList.Add(new Item( - (ItemType) itemType, + (ItemType)itemType, "Items/TestItem " + itemType, "Item " + id, stats, @@ -191,7 +191,7 @@ private void OnMarketplaceFetched(ContractMarketplaceViewResult[] market, Action ); dummyItemList.Add(new Item( - (ItemType) itemType, + (ItemType)itemType, "Items/TestItem " + itemType, "Item " + id, stats, @@ -227,38 +227,40 @@ public void BuyItem(string owner, int itemID) } public void MintItem() + { + const string entrypoint = "mint"; + const string input = "{\"prim\": \"Unit\"}"; + + Tezos.Wallet.CallContract(contractAddress, entrypoint, input, 0); + +#if UNITY_IOS || UNITY_ANDROID + Application.OpenURL("tezos://"); +#endif + } + + public void MintFA2(Action callback) { var rnd = new Random(); var randomInt = rnd.Next(1, int.MaxValue); var randomAmount = rnd.Next(1, 1024); - var uploader = UploaderFactory.GetOnchainUploader(); var activeAccount = Tezos.Wallet.GetActiveAddress(); + const string imageAddress = "ipfs://QmX4t8ikQgjvLdqTtL51v6iVun9tNE7y7Txiw4piGQVNgK"; - CoroutineRunner - .Instance - .StartWrappedCoroutine(uploader.UploadFile(ImageUploaded)); - - void ImageUploaded(string imageAddress) + var metadata = new TokenMetadata { - var metadata = new TokenMetadata - { - Name = $"testName_{randomInt}", - Description = $"testDescription_{randomInt}", - Symbol = $"TST_{randomInt}", - Decimals = "0", - DisplayUri = imageAddress, - ArtifactUri = imageAddress, - ThumbnailUri = imageAddress - }; - - Tezos - .TokenContract - .Mint(token => { Logger.LogDebug($"Minted token with ID: {token.TokenId}"); }, - metadata, - destination: activeAccount, - amount: randomAmount); - } + Name = $"testName_{randomInt}", + Description = $"testDescription_{randomInt}", + Symbol = $"TST_{randomInt}", + Decimals = "0", + DisplayUri = imageAddress, + ArtifactUri = imageAddress, + ThumbnailUri = imageAddress + }; + + Tezos + .TokenContract + .Mint(callback, metadata, activeAccount, randomAmount); #if UNITY_IOS || UNITY_ANDROID Application.OpenURL("tezos://"); @@ -317,7 +319,8 @@ public void TransferItem(int itemID, int amount, string address) const string entrypoint = "transfer"; var input = "[ { \"prim\": \"Pair\", \"args\": [ { \"string\": \"" + sender + "\" }, [ { \"prim\": \"Pair\", \"args\": [ { \"string\": \"" + address + - "\" }, { \"prim\": \"Pair\", \"args\": [ { \"int\": \"" + itemID + "\" }, { \"int\": \"" + amount + + "\" }, { \"prim\": \"Pair\", \"args\": [ { \"int\": \"" + itemID + "\" }, { \"int\": \"" + + amount + "\" } ] } ] } ] ] } ]"; Tezos.Wallet.CallContract(contractAddress, entrypoint, input, 0); diff --git a/Samples~/Scripts/DemoExample/Core/IExampleManager.cs b/Samples~/Scripts/DemoExample/Core/IExampleManager.cs index ac4aea0a..e3055960 100644 --- a/Samples~/Scripts/DemoExample/Core/IExampleManager.cs +++ b/Samples~/Scripts/DemoExample/Core/IExampleManager.cs @@ -4,6 +4,7 @@ using TezosSDK.Beacon; using TezosSDK.Tezos; using TezosSDK.Tezos.API.Models; +using TezosSDK.Tezos.API.Models.Tokens; using TezosSDK.Tezos.Wallet; namespace TezosSDK.Samples.DemoExample @@ -51,6 +52,11 @@ public interface IExampleManager /// Mints an item /// public void MintItem(); + + /// + /// Mints FA2 Token + /// + public void MintFA2(Action callback); /// /// Get account balance diff --git a/Samples~/Scripts/DemoExample/InventoryManager.cs b/Samples~/Scripts/DemoExample/InventoryManager.cs index 805ff7c1..9f984c93 100644 --- a/Samples~/Scripts/DemoExample/InventoryManager.cs +++ b/Samples~/Scripts/DemoExample/InventoryManager.cs @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; using UnityEngine; using UnityEngine.Events; @@ -5,219 +6,226 @@ namespace TezosSDK.Samples.DemoExample { - [RequireComponent(typeof(SnapController))] - public class InventoryManager : MonoBehaviour - { - public UnityEvent onItemMint; - public UnityEvent onInventoryRefresh; - - [SerializeField] private Draggable itemPrefab; - [SerializeField] private List inventorySlots; - [SerializeField] private List equippedSlots; - [SerializeField] private List draggables = new List(); - [SerializeField] private StatsView statsView; - [SerializeField] private ItemView itemView; - - private Dictionary _itemIDtoDraggable = new Dictionary(); - private SnapController _snapController; - private List _lastHeldItems = new List(); - - private const string PlayerPrefsInvKey = "_inv_"; - private const string PlayerPrefsEquipKey = "_eq_"; - - private void Start() - { - _snapController = GetComponent(); - } - - private void OnApplicationQuit() - { - // no need for local storage, since data need to be coming from the blockchain - //SaveInventoryLocally(); - } - - public void Init(List items) - { - //ClearInventory(); - UpdateItems(items); - UpdateSnapController(); - - // no need for local storage, since data need to be coming from the blockchain - //LoadLocalInventory(); - } - - private void AddItem(IItemModel itemModel) - { - Draggable newItem = Instantiate(itemPrefab, this.transform); - ItemReseource itemRes = Resources.Load(itemModel.ResourcePath); - if (itemRes != null) - newItem.Sprite = itemRes.ItemSprite; - else - Logger.LogError("Could find resource file for " + itemModel.ResourcePath); - newItem.Item = itemModel; - newItem.OnClick = OnItemClicked; - draggables.Add(newItem); - ItemSnapPoint emptySlot = GetFirstEmptySlot(); - if (emptySlot != null) - { - newItem.SetCurrentSlot(emptySlot); - _itemIDtoDraggable[itemModel.ID] = newItem; - } - else - { - Logger.LogError("Trying to add an item but Inventory is full!"); - return; - } - } - - /// - /// Adds any missing items and removes any items that should be gone. - /// - public void UpdateItems(List items) - { - ClearInventory(); - UpdateStatsView(); - _lastHeldItems.Clear(); - foreach (IItemModel item in items) - { - _lastHeldItems.Add(item.ID); - if (!_itemIDtoDraggable.ContainsKey(item.ID)) - { - AddItem(item); - } - } - - foreach (var itemToRemove in _itemIDtoDraggable) - { - if (!_lastHeldItems.Contains(itemToRemove.Value.Item.ID)) - { - itemToRemove.Value.CurrentSlot.RemoveItemInSlot(); - //Uncertain if RemoveItemInSlot's event also removes the item from the dictionary or not. - //_itemIDtoDraggable.Remove(itemToRemove.Key); - } - } - } - - private void ClearInventory() - { - foreach (var snapSlot in inventorySlots) - { - snapSlot.RemoveItemInSlot(); - } - - foreach (var snapSlot in equippedSlots) - { - snapSlot.RemoveItemInSlot(); - } - - foreach (var draggable in draggables) - { - Destroy(draggable.gameObject); - } - - draggables.Clear(); - _itemIDtoDraggable.Clear(); - } - - private void UpdateSnapController() - { - _snapController.Draggables = draggables; - _snapController.SnapPoints = inventorySlots; - foreach (var slot in equippedSlots) - _snapController.SnapPoints.Add(slot); - } - - private ItemSnapPoint GetFirstEmptySlot() - { - foreach (var snapPoint in inventorySlots) - if (!snapPoint.HasItem) - return snapPoint; - return null; - } - - private void SaveInventoryLocally() - { - PlayerPrefs.DeleteAll(); - string playerID = ((ExampleManager) ExampleFactory.Instance.GetExampleManager()).CurrentUser.Identifier; - string invSaveLoc = playerID + PlayerPrefsInvKey; - string eqSaveLoc = playerID + PlayerPrefsEquipKey; - for (int i = 0; i < inventorySlots.Count; i++) - { - if (inventorySlots[i].HasItem) - PlayerPrefs.SetInt(invSaveLoc + i, inventorySlots[i].CurrentItemInSlot.Item.ID); - } - - for (int i = 0; i < equippedSlots.Count; i++) - { - if (equippedSlots[i].HasItem) - PlayerPrefs.SetInt(eqSaveLoc + i, equippedSlots[i].CurrentItemInSlot.Item.ID); - } - - Logger.LogDebug("Inventory saved locally."); - } - - private void LoadLocalInventory() - { - ExampleManager db = (ExampleManager) ExampleFactory.Instance.GetExampleManager(); - string playerID = db.CurrentUser.Identifier; - string invSaveLoc = playerID + PlayerPrefsInvKey; - string eqSaveLoc = playerID + PlayerPrefsEquipKey; - for (int i = 0; i < inventorySlots.Count; i++) - { - if (PlayerPrefs.HasKey(invSaveLoc + i)) - { - int itemID = PlayerPrefs.GetInt(invSaveLoc + i); - _itemIDtoDraggable[itemID].SetCurrentSlot(inventorySlots[i]); - } - } - - for (int i = 0; i < equippedSlots.Count; i++) - { - if (PlayerPrefs.HasKey(eqSaveLoc + i)) - { - int itemID = PlayerPrefs.GetInt(eqSaveLoc + i); - _itemIDtoDraggable[itemID].SetCurrentSlot(equippedSlots[i]); - } - } - - Logger.LogDebug("Inventory loaded."); - } - - public void UpdateStatsView() - { - StatParams heroStats = new StatParams(); - - foreach (var slot in equippedSlots) - { - if (!slot.HasItem) - continue; - StatParams sp = slot.CurrentItemInSlot.Item.Stats; - foreach (var prop in sp.GetType().GetProperties()) - { - float value = (float) prop.GetValue(sp) + (float) prop.GetValue(heroStats); - prop.SetValue(heroStats, value); - } - } - - statsView.DisplayStats(heroStats); - } - - public void OnMintButtonClicked() - { - onItemMint.Invoke(); - } - - public void OnRefreshButtonClicked() - { - onInventoryRefresh.Invoke(); - } - - public void OnItemClicked(Draggable item) - { - itemView.transform.parent.gameObject.SetActive(true); - itemView.gameObject.SetActive(true); - itemView.DisplayItem(item.Item, item.Sprite); - itemView.GetComponent().SetItem(item.Item); - } - } + [RequireComponent(typeof(SnapController))] + public class InventoryManager : MonoBehaviour + { + public UnityEvent onItemMint; + public UnityEvent onInventoryRefresh; + + [SerializeField] private Draggable itemPrefab; + [SerializeField] private List inventorySlots; + [SerializeField] private List equippedSlots; + [SerializeField] private List draggables = new List(); + [SerializeField] private StatsView statsView; + [SerializeField] private ItemView itemView; + + private Dictionary _itemIDtoDraggable = new Dictionary(); + private SnapController _snapController; + private List _lastHeldItems = new List(); + + private const string PlayerPrefsInvKey = "_inv_"; + private const string PlayerPrefsEquipKey = "_eq_"; + + private void Start() + { + _snapController = GetComponent(); + } + + private void OnApplicationQuit() + { + // no need for local storage, since data need to be coming from the blockchain + //SaveInventoryLocally(); + } + + public void Init(List items) + { + //ClearInventory(); + UpdateItems(items); + UpdateSnapController(); + + // no need for local storage, since data need to be coming from the blockchain + //LoadLocalInventory(); + } + + private void AddItem(IItemModel itemModel) + { + Draggable newItem = Instantiate(itemPrefab, this.transform); + ItemReseource itemRes = Resources.Load(itemModel.ResourcePath); + if (itemRes != null) + newItem.Sprite = itemRes.ItemSprite; + else + Logger.LogError("Could find resource file for " + itemModel.ResourcePath); + newItem.Item = itemModel; + newItem.OnClick = OnItemClicked; + draggables.Add(newItem); + ItemSnapPoint emptySlot = GetFirstEmptySlot(); + if (emptySlot != null) + { + newItem.SetCurrentSlot(emptySlot); + _itemIDtoDraggable[itemModel.ID] = newItem; + } + else + { + Logger.LogError("Trying to add an item but Inventory is full!"); + return; + } + } + + /// + /// Adds any missing items and removes any items that should be gone. + /// + public void UpdateItems(List items) + { + ClearInventory(); + UpdateStatsView(); + _lastHeldItems.Clear(); + foreach (IItemModel item in items) + { + _lastHeldItems.Add(item.ID); + if (!_itemIDtoDraggable.ContainsKey(item.ID)) + { + AddItem(item); + } + } + + foreach (var itemToRemove in _itemIDtoDraggable) + { + if (!_lastHeldItems.Contains(itemToRemove.Value.Item.ID)) + { + itemToRemove.Value.CurrentSlot.RemoveItemInSlot(); + //Uncertain if RemoveItemInSlot's event also removes the item from the dictionary or not. + //_itemIDtoDraggable.Remove(itemToRemove.Key); + } + } + } + + private void ClearInventory() + { + foreach (var snapSlot in inventorySlots) + { + snapSlot.RemoveItemInSlot(); + } + + foreach (var snapSlot in equippedSlots) + { + snapSlot.RemoveItemInSlot(); + } + + foreach (var draggable in draggables) + { + Destroy(draggable.gameObject); + } + + draggables.Clear(); + _itemIDtoDraggable.Clear(); + } + + private void UpdateSnapController() + { + try + { + _snapController.Draggables = draggables; + _snapController.SnapPoints = inventorySlots; + foreach (var slot in equippedSlots) + _snapController.SnapPoints.Add(slot); + } + catch (NullReferenceException ex) + { + Debug.Log($"Error during UpdateSnapController: {ex.Message}"); + } + } + + private ItemSnapPoint GetFirstEmptySlot() + { + foreach (var snapPoint in inventorySlots) + if (!snapPoint.HasItem) + return snapPoint; + return null; + } + + private void SaveInventoryLocally() + { + PlayerPrefs.DeleteAll(); + string playerID = ((ExampleManager)ExampleFactory.Instance.GetExampleManager()).CurrentUser.Identifier; + string invSaveLoc = playerID + PlayerPrefsInvKey; + string eqSaveLoc = playerID + PlayerPrefsEquipKey; + for (int i = 0; i < inventorySlots.Count; i++) + { + if (inventorySlots[i].HasItem) + PlayerPrefs.SetInt(invSaveLoc + i, inventorySlots[i].CurrentItemInSlot.Item.ID); + } + + for (int i = 0; i < equippedSlots.Count; i++) + { + if (equippedSlots[i].HasItem) + PlayerPrefs.SetInt(eqSaveLoc + i, equippedSlots[i].CurrentItemInSlot.Item.ID); + } + + Logger.LogDebug("Inventory saved locally."); + } + + private void LoadLocalInventory() + { + ExampleManager db = (ExampleManager)ExampleFactory.Instance.GetExampleManager(); + string playerID = db.CurrentUser.Identifier; + string invSaveLoc = playerID + PlayerPrefsInvKey; + string eqSaveLoc = playerID + PlayerPrefsEquipKey; + for (int i = 0; i < inventorySlots.Count; i++) + { + if (PlayerPrefs.HasKey(invSaveLoc + i)) + { + int itemID = PlayerPrefs.GetInt(invSaveLoc + i); + _itemIDtoDraggable[itemID].SetCurrentSlot(inventorySlots[i]); + } + } + + for (int i = 0; i < equippedSlots.Count; i++) + { + if (PlayerPrefs.HasKey(eqSaveLoc + i)) + { + int itemID = PlayerPrefs.GetInt(eqSaveLoc + i); + _itemIDtoDraggable[itemID].SetCurrentSlot(equippedSlots[i]); + } + } + + Logger.LogDebug("Inventory loaded."); + } + + public void UpdateStatsView() + { + StatParams heroStats = new StatParams(); + + foreach (var slot in equippedSlots) + { + if (!slot.HasItem) + continue; + StatParams sp = slot.CurrentItemInSlot.Item.Stats; + foreach (var prop in sp.GetType().GetProperties()) + { + float value = (float)prop.GetValue(sp) + (float)prop.GetValue(heroStats); + prop.SetValue(heroStats, value); + } + } + + statsView.DisplayStats(heroStats); + } + + public void OnMintButtonClicked() + { + onItemMint.Invoke(); + } + + public void OnRefreshButtonClicked() + { + onInventoryRefresh.Invoke(); + } + + public void OnItemClicked(Draggable item) + { + itemView.transform.parent.gameObject.SetActive(true); + itemView.gameObject.SetActive(true); + itemView.DisplayItem(item.Item, item.Sprite); + itemView.GetComponent().SetItem(item.Item); + } + } } \ No newline at end of file diff --git a/Samples~/Scripts/DemoExample/UI/RegisterPanel.cs b/Samples~/Scripts/DemoExample/UI/RegisterPanel.cs index a2e7a00b..0f30af69 100644 --- a/Samples~/Scripts/DemoExample/UI/RegisterPanel.cs +++ b/Samples~/Scripts/DemoExample/UI/RegisterPanel.cs @@ -24,7 +24,8 @@ private IEnumerator Start() yield return null; _exampleManager = ExampleFactory.Instance.GetExampleManager(); - _exampleManager.GetWalletMessageReceiver().HandshakeReceived += (handshake) => _qrCodeView.SetQrCode(handshake); + _exampleManager.GetWalletMessageReceiver().HandshakeReceived += + (handshake) => _qrCodeView.SetQrCode(handshake); SetButtonState(_deepLinkPair, false, false); SetButtonState(_socialLoginButton, false, false); @@ -101,6 +102,15 @@ public void DeployContract() }); } + public void MintFA2() + { + _exampleManager.MintFA2(mintedTokenBalance => + { + _uiManager.DisplayPopup($"Minted token with ID: {mintedTokenBalance.TokenId}"); + }); + } + + public void ChangeContract() { _uiManager.ChangeContract(); diff --git a/Samples~/Scripts/DemoExample/UIManager.cs b/Samples~/Scripts/DemoExample/UIManager.cs index 0a9d8b07..0bff0ac8 100644 --- a/Samples~/Scripts/DemoExample/UIManager.cs +++ b/Samples~/Scripts/DemoExample/UIManager.cs @@ -188,7 +188,7 @@ public void UpdateContracts() }); } - private void DisplayPopup(string message) + public void DisplayPopup(string message) { UnityMainThreadDispatcher.Enqueue((msg) => { diff --git a/package.json b/package.json index b413a947..84da69ee 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "com.trilitech.tezos-unity-sdk", - "version": "2.0.2", + "version": "2.0.3", "unity": "2021.3", "displayName": "Tezos Unity SDK", "description": "Unity SDK for Tezos",