diff --git a/.gitignore b/.gitignore index 288fbd33..6d917702 100644 --- a/.gitignore +++ b/.gitignore @@ -65,6 +65,7 @@ sysinfo.txt *.aab *.unitypackage *.app +webglbuild # Crashlytics generated file crashlytics-build.properties diff --git a/Assets/Thirdweb/Runtime/NET/Thirdweb.dll b/Assets/Thirdweb/Runtime/NET/Thirdweb.dll index 98e61181..91a2c2d3 100755 Binary files a/Assets/Thirdweb/Runtime/NET/Thirdweb.dll and b/Assets/Thirdweb/Runtime/NET/Thirdweb.dll differ diff --git a/Assets/Thirdweb/Runtime/Unity/Browser/CrossPlatformUnityBrowser.cs b/Assets/Thirdweb/Runtime/Unity/Browser/CrossPlatformUnityBrowser.cs index 18a03fce..836ae68f 100755 --- a/Assets/Thirdweb/Runtime/Unity/Browser/CrossPlatformUnityBrowser.cs +++ b/Assets/Thirdweb/Runtime/Unity/Browser/CrossPlatformUnityBrowser.cs @@ -16,12 +16,23 @@ public CrossPlatformUnityBrowser(string htmlOverride = null) htmlOverride = null; } - var go = new GameObject("WebGLInAppWalletBrowser"); - #if UNITY_EDITOR _unityBrowser = new InAppWalletBrowser(htmlOverride); #elif UNITY_WEBGL - _unityBrowser = go.AddComponent(); +#if UNITY_6000_0_OR_NEWER + var existingBrowser = UnityEngine.Object.FindAnyObjectByType(); +#else + var existingBrowser = GameObject.FindObjectOfType(); +#endif + if (existingBrowser != null) + { + _unityBrowser = existingBrowser; + } + else + { + var go = new GameObject("WebGLInAppWalletBrowser"); + _unityBrowser = go.AddComponent(); + } #elif UNITY_ANDROID _unityBrowser = new AndroidBrowser(); #elif UNITY_IOS diff --git a/Assets/Thirdweb/Runtime/Unity/ThirdwebManagerBase.cs b/Assets/Thirdweb/Runtime/Unity/ThirdwebManagerBase.cs index 8dbf3ff3..d8876bbd 100755 --- a/Assets/Thirdweb/Runtime/Unity/ThirdwebManagerBase.cs +++ b/Assets/Thirdweb/Runtime/Unity/ThirdwebManagerBase.cs @@ -225,7 +225,7 @@ public abstract class ThirdwebManagerBase : MonoBehaviour public static ThirdwebManagerBase Instance { get; protected set; } - public static readonly string THIRDWEB_UNITY_SDK_VERSION = "5.17.2"; + public static readonly string THIRDWEB_UNITY_SDK_VERSION = "5.18.5"; protected const string THIRDWEB_AUTO_CONNECT_OPTIONS_KEY = "ThirdwebAutoConnectOptions"; diff --git a/Assets/Treasure/TDK/ConnectInternal/Prefabs/Modals/Landscape/LoginModal Landscape.prefab b/Assets/Treasure/TDK/ConnectInternal/Prefabs/Modals/Landscape/LoginModal Landscape.prefab index fdf065c1..322edd0d 100644 --- a/Assets/Treasure/TDK/ConnectInternal/Prefabs/Modals/Landscape/LoginModal Landscape.prefab +++ b/Assets/Treasure/TDK/ConnectInternal/Prefabs/Modals/Landscape/LoginModal Landscape.prefab @@ -1,5 +1,154 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &353228291481729166 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5387518565286470974} + - component: {fileID: 8338320773008628448} + - component: {fileID: 8836282158587206833} + - component: {fileID: 3682707257476948388} + m_Layer: 5 + m_Name: LabelText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5387518565286470974 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 353228291481729166} + 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: 5221454154946686295} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8338320773008628448 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 353228291481729166} + m_CullTransparentMesh: 1 +--- !u!114 &8836282158587206833 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 353228291481729166} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Metamask + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: c4ea218dd51bc52448c157e5d9e720e1, type: 2} + m_sharedMaterial: {fileID: -6057154001904965228, guid: c4ea218dd51bc52448c157e5d9e720e1, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4286411888 + m_fontColor: {r: 0.4392157, g: 0.45490196, b: 0.49019608, 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: 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!114 &3682707257476948388 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 353228291481729166} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 48a99fe6f98fe774dafa3ddf0d490f6d, type: 3} + m_Name: + m_EditorClassIdentifier: + graphic: {fileID: 8836282158587206833} + type: 3 --- !u!1 &602965016161727493 GameObject: m_ObjectHideFlags: 0 @@ -258,6 +407,7 @@ RectTransform: - {fileID: 410767483982038271} - {fileID: 3324441976173838679} - {fileID: 3304700904501916671} + - {fileID: 5221454154946686295} m_Father: {fileID: 4281580372477015370} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -467,7 +617,181 @@ MonoBehaviour: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3509074055764820260} + m_GameObject: {fileID: 3509074055764820260} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 10 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!1 &3823534999757617380 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8363556970536556018} + - component: {fileID: 7291852985191669181} + - component: {fileID: 450737338952531783} + - component: {fileID: 6084945757882497963} + - component: {fileID: 7237101014724574666} + m_Layer: 5 + m_Name: Frame + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8363556970536556018 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3823534999757617380} + 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: 5221454154946686295} + 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 &7291852985191669181 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3823534999757617380} + m_CullTransparentMesh: 1 +--- !u!114 &450737338952531783 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3823534999757617380} + 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.90588236, g: 0.9098039, b: 0.9137255, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 0b241d22dbff6c54eb4e0ca56fc844fb, type: 3} + 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: 7 +--- !u!114 &6084945757882497963 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3823534999757617380} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &7237101014724574666 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3823534999757617380} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 48a99fe6f98fe774dafa3ddf0d490f6d, type: 3} + m_Name: + m_EditorClassIdentifier: + graphic: {fileID: 450737338952531783} + type: 2 +--- !u!1 &3926988336581362705 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1815234971780781271} + - component: {fileID: 1249203117119994346} + m_Layer: 5 + m_Name: IconsHolder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1815234971780781271 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3926988336581362705} + 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: 6649257265588939275} + m_Father: {fileID: 5221454154946686295} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1249203117119994346 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3926988336581362705} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} @@ -479,11 +803,11 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 4 - m_Spacing: 10 + m_Spacing: 4 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 1 - m_ChildControlHeight: 0 + m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 @@ -574,6 +898,102 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1 &4687108985584433811 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6649257265588939275} + - component: {fileID: 7615065311706026889} + - component: {fileID: 1606906097763835173} + - component: {fileID: 1154491568386733348} + m_Layer: 5 + m_Name: Icon (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6649257265588939275 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4687108985584433811} + 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: 1815234971780781271} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7615065311706026889 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4687108985584433811} + m_CullTransparentMesh: 1 +--- !u!114 &1606906097763835173 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4687108985584433811} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: aa86dd6994fc442729e5de0fedea9007, 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!114 &1154491568386733348 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4687108985584433811} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: 24 + m_PreferredHeight: 24 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &4827536534508864603 GameObject: m_ObjectHideFlags: 0 @@ -636,6 +1056,7 @@ MonoBehaviour: loginDiscordButton: {fileID: 6678713758515909314} loginXButton: {fileID: 8069889168041935062} loginWalletButton: {fileID: 6072660517350402501} + loginMetamaskButton: {fileID: 4962114168605112101} socialsErrorText: {fileID: 8319534439779740862} emailInputField: {fileID: 7865467718503614030} errorText: {fileID: 1231587350348382669} @@ -2116,6 +2537,192 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!1 &8726423195522015347 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5221454154946686295} + - component: {fileID: 2231620889027258059} + - component: {fileID: 100244801240358515} + - component: {fileID: 4962114168605112101} + - component: {fileID: 7081742879927327965} + - component: {fileID: 5693668551395915131} + - component: {fileID: 5469405027243641329} + m_Layer: 5 + m_Name: ConnectWithMetamaskButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5221454154946686295 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8726423195522015347} + 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: 8363556970536556018} + - {fileID: 1815234971780781271} + - {fileID: 5387518565286470974} + m_Father: {fileID: 8187741287968447434} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2231620889027258059 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8726423195522015347} + m_CullTransparentMesh: 1 +--- !u!114 &100244801240358515 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8726423195522015347} + 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: 0.98039216, b: 0.9372549, 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: ceeff580337b6b24a8f103dcbac63e04, type: 3} + 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: 7 +--- !u!114 &4962114168605112101 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8726423195522015347} + 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: 100244801240358515} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &7081742879927327965 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8726423195522015347} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: 44 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &5693668551395915131 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8726423195522015347} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 12 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &5469405027243641329 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8726423195522015347} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 48a99fe6f98fe774dafa3ddf0d490f6d, type: 3} + m_Name: + m_EditorClassIdentifier: + graphic: {fileID: 100244801240358515} + type: 1 --- !u!1 &8745309591255476732 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Treasure/TDK/ConnectInternal/Prefabs/Modals/Portait/LoginModal Portrait.prefab b/Assets/Treasure/TDK/ConnectInternal/Prefabs/Modals/Portait/LoginModal Portrait.prefab index 00bb888d..09ccdd0b 100644 --- a/Assets/Treasure/TDK/ConnectInternal/Prefabs/Modals/Portait/LoginModal Portrait.prefab +++ b/Assets/Treasure/TDK/ConnectInternal/Prefabs/Modals/Portait/LoginModal Portrait.prefab @@ -63,6 +63,155 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1 &642644486601192010 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5969081964824068991} + - component: {fileID: 3833498997633191817} + - component: {fileID: 8145446971236059640} + - component: {fileID: 489287888029665706} + m_Layer: 5 + m_Name: LabelText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5969081964824068991 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 642644486601192010} + 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: 2957712299998496296} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3833498997633191817 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 642644486601192010} + m_CullTransparentMesh: 1 +--- !u!114 &8145446971236059640 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 642644486601192010} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Metamask + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: c4ea218dd51bc52448c157e5d9e720e1, type: 2} + m_sharedMaterial: {fileID: -6057154001904965228, guid: c4ea218dd51bc52448c157e5d9e720e1, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4286411888 + m_fontColor: {r: 0.4392157, g: 0.45490196, b: 0.49019608, 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: 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!114 &489287888029665706 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 642644486601192010} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 48a99fe6f98fe774dafa3ddf0d490f6d, type: 3} + m_Name: + m_EditorClassIdentifier: + graphic: {fileID: 8145446971236059640} + type: 3 --- !u!1 &868979424513346930 GameObject: m_ObjectHideFlags: 0 @@ -409,6 +558,7 @@ MonoBehaviour: loginDiscordButton: {fileID: 3250561422971331914} loginXButton: {fileID: 6011301378662753997} loginWalletButton: {fileID: 2163981100647043125} + loginMetamaskButton: {fileID: 5413536189273607809} socialsErrorText: {fileID: 7484056030187560527} emailInputField: {fileID: 6886330902996831971} errorText: {fileID: 2567494222789691744} @@ -966,6 +1116,117 @@ MonoBehaviour: m_EditorClassIdentifier: graphic: {fileID: 2285404307530880980} type: 10 +--- !u!1 &5061157641817431753 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 716208673218144297} + - component: {fileID: 4676135547678922754} + - component: {fileID: 7664898315376637162} + - component: {fileID: 2937593165903485689} + - component: {fileID: 1118411583546176662} + m_Layer: 5 + m_Name: Frame + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &716208673218144297 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5061157641817431753} + 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: 2957712299998496296} + 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 &4676135547678922754 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5061157641817431753} + m_CullTransparentMesh: 1 +--- !u!114 &7664898315376637162 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5061157641817431753} + 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.90588236, g: 0.9098039, b: 0.9137255, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 0b241d22dbff6c54eb4e0ca56fc844fb, type: 3} + 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: 7 +--- !u!114 &2937593165903485689 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5061157641817431753} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &1118411583546176662 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5061157641817431753} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 48a99fe6f98fe774dafa3ddf0d490f6d, type: 3} + m_Name: + m_EditorClassIdentifier: + graphic: {fileID: 7664898315376637162} + type: 2 --- !u!1 &5198618471701588360 GameObject: m_ObjectHideFlags: 0 @@ -1002,6 +1263,7 @@ RectTransform: - {fileID: 990621928039118759} - {fileID: 7649487552019382691} - {fileID: 8435618503937783641} + - {fileID: 2957712299998496296} m_Father: {fileID: 6848740655419140236} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -1248,7 +1510,7 @@ MonoBehaviour: m_EditorClassIdentifier: graphic: {fileID: 8069640101701614323} type: 1 ---- !u!1 &6814612555401840183 +--- !u!1 &5790975584375690123 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1256,31 +1518,35 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4536919415944416668} - - component: {fileID: 2116326682807458565} - - component: {fileID: 3463694429315429448} + - component: {fileID: 2957712299998496296} + - component: {fileID: 3475278488655202008} + - component: {fileID: 1520259262807644339} + - component: {fileID: 5413536189273607809} + - component: {fileID: 4141549452418308820} + - component: {fileID: 8432700761618965645} + - component: {fileID: 7282751702732481434} m_Layer: 5 - m_Name: Separator + m_Name: ConnectWithMetamaskButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4536919415944416668 +--- !u!224 &2957712299998496296 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6814612555401840183} + m_GameObject: {fileID: 5790975584375690123} 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: 6203068448273722717} - - {fileID: 7365058403857974117} - - {fileID: 3062046058788578808} + - {fileID: 716208673218144297} + - {fileID: 4038084661943823369} + - {fileID: 5969081964824068991} m_Father: {fileID: 5775999337600641846} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -1288,33 +1554,278 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2116326682807458565 -MonoBehaviour: +--- !u!222 &3475278488655202008 +CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6814612555401840183} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: 20 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 ---- !u!114 &3463694429315429448 + m_GameObject: {fileID: 5790975584375690123} + m_CullTransparentMesh: 1 +--- !u!114 &1520259262807644339 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6814612555401840183} + m_GameObject: {fileID: 5790975584375690123} + 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: 0.98039216, b: 0.9372549, 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: ceeff580337b6b24a8f103dcbac63e04, type: 3} + 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: 7 +--- !u!114 &5413536189273607809 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5790975584375690123} + 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: 1520259262807644339} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &4141549452418308820 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5790975584375690123} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: 44 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &8432700761618965645 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5790975584375690123} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 12 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &7282751702732481434 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5790975584375690123} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 48a99fe6f98fe774dafa3ddf0d490f6d, type: 3} + m_Name: + m_EditorClassIdentifier: + graphic: {fileID: 1520259262807644339} + type: 1 +--- !u!1 &6221500191627845719 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4038084661943823369} + - component: {fileID: 1697306176520520263} + m_Layer: 5 + m_Name: IconsHolder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4038084661943823369 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6221500191627845719} + 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: 1396931226945931933} + m_Father: {fileID: 2957712299998496296} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1697306176520520263 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6221500191627845719} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 4 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!1 &6814612555401840183 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4536919415944416668} + - component: {fileID: 2116326682807458565} + - component: {fileID: 3463694429315429448} + m_Layer: 5 + m_Name: Separator + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4536919415944416668 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6814612555401840183} + 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: 6203068448273722717} + - {fileID: 7365058403857974117} + - {fileID: 3062046058788578808} + m_Father: {fileID: 5775999337600641846} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2116326682807458565 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6814612555401840183} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: 20 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &3463694429315429448 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6814612555401840183} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} @@ -1483,6 +1994,102 @@ MonoBehaviour: m_EditorClassIdentifier: graphic: {fileID: 9013845312976065423} type: 3 +--- !u!1 &7436188416969863228 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1396931226945931933} + - component: {fileID: 5128576123359369478} + - component: {fileID: 5811975050887198633} + - component: {fileID: 6521078876365758032} + m_Layer: 5 + m_Name: Icon (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1396931226945931933 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7436188416969863228} + 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: 4038084661943823369} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5128576123359369478 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7436188416969863228} + m_CullTransparentMesh: 1 +--- !u!114 &5811975050887198633 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7436188416969863228} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: aa86dd6994fc442729e5de0fedea9007, 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!114 &6521078876365758032 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7436188416969863228} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: 24 + m_PreferredHeight: 24 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &7436521392607875424 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Treasure/TDK/ConnectInternal/Sprites/Icons/MetaMask-icon-Fox.png b/Assets/Treasure/TDK/ConnectInternal/Sprites/Icons/MetaMask-icon-Fox.png new file mode 100644 index 00000000..38daf00a Binary files /dev/null and b/Assets/Treasure/TDK/ConnectInternal/Sprites/Icons/MetaMask-icon-Fox.png differ diff --git a/Assets/Treasure/TDK/ConnectInternal/Sprites/Icons/MetaMask-icon-Fox.png.meta b/Assets/Treasure/TDK/ConnectInternal/Sprites/Icons/MetaMask-icon-Fox.png.meta new file mode 100644 index 00000000..8cf4fd28 --- /dev/null +++ b/Assets/Treasure/TDK/ConnectInternal/Sprites/Icons/MetaMask-icon-Fox.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: aa86dd6994fc442729e5de0fedea9007 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Treasure/TDK/Runtime/Connect/Modals/LoginModal.cs b/Assets/Treasure/TDK/Runtime/Connect/Modals/LoginModal.cs index a6f56221..e0600af6 100644 --- a/Assets/Treasure/TDK/Runtime/Connect/Modals/LoginModal.cs +++ b/Assets/Treasure/TDK/Runtime/Connect/Modals/LoginModal.cs @@ -15,6 +15,7 @@ public class LoginModal : ModalBase [SerializeField] private Button loginDiscordButton; [SerializeField] private Button loginXButton; [SerializeField] private Button loginWalletButton; + [SerializeField] private Button loginMetamaskButton; [SerializeField] private TMP_Text socialsErrorText; [Space] [SerializeField] private TMP_InputField emailInputField; @@ -38,6 +39,9 @@ private void Start() loginWalletButton.gameObject.SetActive(TDK.AppConfig.EnableWalletLogin); loginWalletButton.onClick.AddListener(() => { ConnectExternalWallet(); }); + + loginMetamaskButton.gameObject.SetActive(TDK.AppConfig.EnableMetamaskWebglLogin); + loginMetamaskButton.onClick.AddListener(() => { ConnectWithMetamask(); }); } private void OnEnable() @@ -178,6 +182,31 @@ private async void ConnectExternalWallet() } } + private async void ConnectWithMetamask() + { + if (!TDK.Instance.AbstractedEngineApi.HasInternetConnection()) + { + socialsErrorText.text = "Please make sure you have active Internet connection."; + socialsErrorText.gameObject.SetActive(true); + return; + } + + try + { + await TDK.Connect.Disconnect(); // clean up any previous connection attempts + await TDK.Connect.ConnectWithMetamask(); + } + catch (Exception ex) + { + if (ex.Message != "New connection attempt has been made") + { + TDKLogger.LogException($"[LoginModal:ConnectWithMetamask] Error connecting", ex); + socialsErrorText.text = ex.Message; + socialsErrorText.gameObject.SetActive(true); + } + } + } + // test code // IEnumerator WaitToGoToConfirmLogin() // { diff --git a/Assets/Treasure/TDK/Runtime/Connect/TDK.Connect.cs b/Assets/Treasure/TDK/Runtime/Connect/TDK.Connect.cs index 9d9aef96..11aa694e 100644 --- a/Assets/Treasure/TDK/Runtime/Connect/TDK.Connect.cs +++ b/Assets/Treasure/TDK/Runtime/Connect/TDK.Connect.cs @@ -204,8 +204,18 @@ public async Task ConnectExternalWallet() TDKLogger.LogDebug($"[TDK.Connect:ConnectExternalWallet] Connection success!"); } + public async Task ConnectWithMetamask() + { + var thirdwebService = TDKServiceLocator.GetService(); + await thirdwebService.ConnectWithMetamask(ChainIdNumber); + + await UpdateConnectInfo(ChainId); + TDKLogger.LogDebug($"[TDK.Connect:ConnectWithMetamask] Connection success!"); + } + public async Task ConnectViaCookie(string authCookie, AuthProvider authProvider, string email = null) { + TDKLogger.LogDebug($"[TDK.Connect:ConnectViaCookie] Connecting via auth cookie (provider: {authProvider})"); var thirdwebService = TDKServiceLocator.GetService(); var ecosystemWalletOptions = new EcosystemWalletOptions(authprovider: authProvider, email: email); @@ -218,12 +228,19 @@ await thirdwebService.ConnectWallet( if (await thirdwebService.IsWalletConnected()) { await UpdateConnectInfo(ChainId); - TDKLogger.LogDebug($"[TDK.Connect:ConnectViaLauncherCookie] Connection success!"); + TDKLogger.LogDebug($"[TDK.Connect:ConnectViaCookie] Connection success!"); return true; } + TDKLogger.LogDebug($"[TDK.Connect:ConnectViaCookie] Connection failed"); return false; } + public string GetStoredAuthCookie() + { + var thirdwebService = TDKServiceLocator.GetService(); + return thirdwebService.GetStoredAuthCookie(); + } + public async Task Reconnect(string email) { TDKLogger.LogDebug($"[TDK.Connect:Reconnect] Reconnecting email ({email})..."); diff --git a/Assets/Treasure/TDK/Runtime/Identity/TDK.Identity.cs b/Assets/Treasure/TDK/Runtime/Identity/TDK.Identity.cs index 856e1037..01702972 100644 --- a/Assets/Treasure/TDK/Runtime/Identity/TDK.Identity.cs +++ b/Assets/Treasure/TDK/Runtime/Identity/TDK.Identity.cs @@ -376,7 +376,6 @@ public async Task AttemptConnectionViaLauncherAuth() { return; } - TDKLogger.LogDebug($"Connecting via auth cookie (provider: {launcherAuthProvider.Value})"); var didConnect = await TDK.Connect.ConnectViaCookie( launcherAuthCookie, launcherAuthProvider.Value, diff --git a/Assets/Treasure/TDK/Runtime/Services/Thirdweb/TDKThirdwebService.cs b/Assets/Treasure/TDK/Runtime/Services/Thirdweb/TDKThirdwebService.cs index 1964a94e..2515d684 100644 --- a/Assets/Treasure/TDK/Runtime/Services/Thirdweb/TDKThirdwebService.cs +++ b/Assets/Treasure/TDK/Runtime/Services/Thirdweb/TDKThirdwebService.cs @@ -22,6 +22,7 @@ public class TDKThirdwebService : TDKBaseService private CancellationTokenSource _connectionCancelationTokenSource; private bool _didInitWalletConnect = false; + private string _authCookie = ""; public override void Awake() { @@ -46,10 +47,11 @@ private void InitializeSDK(string chainIdentifier) var clientId = TDK.AppConfig.ClientId; bundleId = !string.IsNullOrEmpty(Application.identifier) ? Application.identifier : $"com.{Application.companyName}.{Application.productName}"; - + bundleId = bundleId.ToLower(); + Client = ThirdwebClient.Create( clientId: clientId, - bundleId: bundleId.ToLower(), + bundleId: bundleId, httpClient: Application.platform == RuntimePlatform.WebGLPlayer ? new UnityThirdwebHttpClient() : new ThirdwebHttpClient(), @@ -142,6 +144,7 @@ public async Task ConnectWallet(EcosystemWalletOptions ecosystemWalletOptions, i "Upgrading to smart wallet" ); } + _authCookie = ExtractAuthCookie(ecosystemWallet); smartWallet = await SmartWallet.Create( personalWallet: ecosystemWallet, chainId: chainId, @@ -166,6 +169,25 @@ public async Task ConnectWallet(EcosystemWalletOptions ecosystemWalletOptions, i } } + private string ExtractAuthCookie(EcosystemWallet ecosystemWallet) + { + try + { + var link = ecosystemWallet.GenerateExternalLoginLink("localhost:3456"); + return link.Split("authCookie=")[1]; + } + catch (Exception ex) + { + TDKLogger.LogException("error parsing auth cookie", ex); + return ""; + } + } + + public string GetStoredAuthCookie() + { + return _authCookie; + } + public async Task ConnectExternalWallet(int chainId) { _connectionCancelationTokenSource?.Cancel(); @@ -180,6 +202,14 @@ public async Task ConnectExternalWallet(int chainId) await ConnectWallet(options, TDK.Connect.ChainIdNumber, isSilentReconnect: false); } + public async Task ConnectWithMetamask(int chainId) + { + _connectionCancelationTokenSource?.Cancel(); + MetaMaskWallet wallet = await MetaMaskWallet.Create(client: Client, activeChainId: chainId); + var options = new EcosystemWalletOptions(authprovider: AuthProvider.Siwe, siweSigner: wallet); + await ConnectWallet(options, TDK.Connect.ChainIdNumber, isSilentReconnect: false); + } + public void EnsureWalletConnectInitialized() { if (_didInitWalletConnect == false) @@ -232,6 +262,7 @@ public async Task DisconnectWallet() TDKLogger.LogInfo("[TDKThirdwebService:DisconnectWallet] Active wallet disconnected"); } await UniTask.WaitForEndOfFrame(this); + _authCookie = ""; ActiveWallet = null; } } diff --git a/Assets/Treasure/TDK/Runtime/TDKConfig.cs b/Assets/Treasure/TDK/Runtime/TDKConfig.cs index 7db766b5..4a513210 100644 --- a/Assets/Treasure/TDK/Runtime/TDKConfig.cs +++ b/Assets/Treasure/TDK/Runtime/TDKConfig.cs @@ -77,6 +77,7 @@ public enum ConnectUIHideBehavior { HideOnOutsideClick, DoNotHideOnOtpScreen, Ne [Header("Misc")] [SerializeField] private ConnectUIHideBehavior _connectHideBehavior = ConnectUIHideBehavior.DoNotHideOnOtpScreen; [SerializeField] private bool _enableWalletLogin = false; + [SerializeField] private bool _enableMetamaskWebglLogin = false; [SerializeField] private LoggerLevelValue _devLoggerLevel = LoggerLevelValue.INFO; [SerializeField] private LoggerLevelValue _prodLoggerLevel = LoggerLevelValue.INFO; [SerializeField] private bool _autoInitialize = true; @@ -120,6 +121,7 @@ public ConnectUIHideBehavior ConnectHideBehavior set { _connectHideBehavior = value; } } public bool EnableWalletLogin => _enableWalletLogin; + public bool EnableMetamaskWebglLogin => Application.platform == RuntimePlatform.WebGLPlayer && _enableMetamaskWebglLogin; public string ApiKey => Environment == Env.DEV ? _general._devApiKey : _general._prodApiKey; public bool AutoInitialize => _autoInitialize; @@ -227,6 +229,17 @@ public void SetConfig(SerializedTDKConfig config, TDKConfig previousConfig) _devApiUrl = config.analytics.devApiUrl, _prodApiUrl = config.analytics.prodApiUrl, }; + + // Misc + if (previousConfig != null) + { + _enableWalletLogin = previousConfig._enableWalletLogin; + _enableMetamaskWebglLogin = previousConfig._enableMetamaskWebglLogin; + _connectHideBehavior = previousConfig._connectHideBehavior; + _devLoggerLevel = previousConfig._devLoggerLevel; + _prodLoggerLevel = previousConfig._prodLoggerLevel; + _autoInitialize = previousConfig._autoInitialize; + } } } diff --git a/versions.txt b/versions.txt index 1ec77c32..198c9f3a 100644 --- a/versions.txt +++ b/versions.txt @@ -1 +1 @@ -thirdweb: 5.17.2 \ No newline at end of file +thirdweb: 5.18.5 \ No newline at end of file