diff --git a/sample/Assets/Scenes/Other/LaunchBrowser.unity b/sample/Assets/Scenes/Other/LaunchBrowser.unity index 0ed735b5..602b06fb 100644 --- a/sample/Assets/Scenes/Other/LaunchBrowser.unity +++ b/sample/Assets/Scenes/Other/LaunchBrowser.unity @@ -194,7 +194,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Cancel + m_Text: Open Dev Tools --- !u!222 &128733934 CanvasRenderer: m_ObjectHideFlags: 0 @@ -240,8 +240,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 109.047295, y: 0} - m_SizeDelta: {x: 218.09459, y: 0} + m_AnchoredPosition: {x: 107.9256, y: 0} + m_SizeDelta: {x: 215.8512, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &410008536 MonoBehaviour: @@ -403,6 +403,140 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &573403230 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 573403231} + - component: {fileID: 573403234} + - component: {fileID: 573403233} + - component: {fileID: 573403232} + m_Layer: 5 + m_Name: CloseButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &573403231 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 573403230} + 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: 2103796621} + m_Father: {fileID: 919977496} + m_RootOrder: 1 + 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: 260, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &573403232 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 573403230} + 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: 573403233} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1192763474} + m_TargetAssemblyTypeName: LaunchBrowserScript, Assembly-CSharp + m_MethodName: Cancel + 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 &573403233 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 573403230} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &573403234 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 573403230} + m_CullTransparentMesh: 1 --- !u!1 &604382073 GameObject: m_ObjectHideFlags: 0 @@ -439,7 +573,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 600} + m_SizeDelta: {x: 0, y: 800} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &604382075 MonoBehaviour: @@ -480,7 +614,7 @@ GameObject: - component: {fileID: 740387921} - component: {fileID: 740387920} m_Layer: 5 - m_Name: CloseButton + m_Name: OpenDevToolsButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -553,7 +687,7 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 1192763474} m_TargetAssemblyTypeName: LaunchBrowserScript, Assembly-CSharp - m_MethodName: Cancel + m_MethodName: OpenDevTools m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -631,6 +765,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 740387919} + - {fileID: 573403231} m_Father: {fileID: 1140911600} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -700,13 +835,13 @@ RectTransform: - {fileID: 410008535} - {fileID: 604382074} - {fileID: 919977496} - m_Father: {fileID: 1227009913} + m_Father: {fileID: 1850628784} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: -40, y: -40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1140911601 MonoBehaviour: @@ -839,83 +974,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3eeaa3a2cd0848d7959c911575e342e3, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1227009912 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1227009913} - - component: {fileID: 1227009914} - - component: {fileID: 1227009915} - m_Layer: 5 - m_Name: Content - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1227009913 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1227009912} - 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: 1140911600} - m_Father: {fileID: 1850628784} - m_RootOrder: 0 - 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 &1227009914 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1227009912} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3eff14abe3dbe4539982d7c5e20b0a58, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1227009915 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1227009912} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 20 - m_Right: 20 - m_Top: 20 - m_Bottom: 20 - m_ChildAlignment: 0 - m_Spacing: 20 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 1 - m_ChildControlHeight: 1 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 + webBrowser: {fileID: 1380957388} + openDevToolsButton: {fileID: 740387920} --- !u!1 &1260077984 GameObject: m_ObjectHideFlags: 0 @@ -1022,7 +1082,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1000, y: 600} + m_SizeDelta: {x: 1000, y: 800} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1380957385 MonoBehaviour: @@ -1093,10 +1153,10 @@ MonoBehaviour: m_EditorClassIdentifier: browserClient: engine: {fileID: 11400000, guid: aeff70489cd2bec4eb801f16a8c49198, type: 2} - initialUrl: https://www.immutable.com + initialUrl: https://toolkit.immutable.com/checkout/on-ramp/?publishableKey=pk_imapik-test-Xdera@&amount=10&tokenAddress=0x6de8acc0d406837030ce4dd28e7c08c5a96a30d2 resolution: - Width: 1920 - Height: 1080 + Width: 1200 + Height: 1000 backgroundColor: serializedVersion: 2 rgba: 4294967295 @@ -1104,7 +1164,7 @@ MonoBehaviour: cache: 1 incognitoMode: 0 localStorage: 1 - popupAction: 0 + popupAction: 1 proxySettings: Username: Password: @@ -1162,7 +1222,7 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1227009913} + - {fileID: 1140911600} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1284,3 +1344,83 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1850628783} m_CullTransparentMesh: 1 +--- !u!1 &2103796620 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2103796621} + - component: {fileID: 2103796623} + - component: {fileID: 2103796622} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2103796621 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2103796620} + 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: 573403231} + m_RootOrder: 0 + 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 &2103796622 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2103796620} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 24 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Cancel +--- !u!222 &2103796623 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2103796620} + m_CullTransparentMesh: 1 diff --git a/sample/Assets/Scripts/Other/LaunchBrowserScript.cs b/sample/Assets/Scripts/Other/LaunchBrowserScript.cs index eb9761ad..970c58c1 100644 --- a/sample/Assets/Scripts/Other/LaunchBrowserScript.cs +++ b/sample/Assets/Scripts/Other/LaunchBrowserScript.cs @@ -1,8 +1,35 @@ +#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) using UnityEngine; using UnityEngine.SceneManagement; +using UnityEngine.UI; +using VoltstroStudios.UnityWebBrowser; +using VoltstroStudios.UnityWebBrowser.Core; public class LaunchBrowserScript : MonoBehaviour { + [SerializeField] private WebBrowserUIFull webBrowser; + [SerializeField] private Button openDevToolsButton; + + private WebBrowserClient? webBrowserClient; + + public void Start() + { + webBrowser.browserClient.OnLoadFinish += OnLoadFinish; + + void OnLoadFinish(string url) + { + webBrowser.browserClient.OnLoadFinish -= OnLoadFinish; + webBrowserClient = webBrowser.browserClient; + } + } + + /// + /// Opens the dev tools for the browser + /// + public void OpenDevTools() + { + webBrowserClient?.OpenDevTools(); + } /// /// Navigates back to the authenticated scene. @@ -12,3 +39,4 @@ public void Cancel() SceneManager.LoadScene("AuthenticatedScene"); } } +#endif \ No newline at end of file diff --git a/src/Packages/Passport/Runtime/Scripts/Public/Immutable.Passport.Runtime.asmdef b/src/Packages/Passport/Runtime/Scripts/Public/Immutable.Passport.Runtime.asmdef index 7e45913c..73c95a28 100644 --- a/src/Packages/Passport/Runtime/Scripts/Public/Immutable.Passport.Runtime.asmdef +++ b/src/Packages/Passport/Runtime/Scripts/Public/Immutable.Passport.Runtime.asmdef @@ -2,20 +2,20 @@ "name": "Immutable.Passport.Runtime.Public", "rootNamespace": "Immutable.Passport", "references": [ - "VoltstroStudios.UnityWebBrowser", "UniTask", "Immutable.Browser.Core", "Immutable.Browser.Gree", "Immutable.Passport.Runtime.Private", - "Immutable.Passport.Core.Logging" + "Immutable.Passport.Core.Logging", + "VoltstroStudios.UnityWebBrowser" ], "includePlatforms": [ "Android", "Editor", "iOS", "macOSStandalone", - "WindowsStandalone64", - "WebGL" + "WebGL", + "WindowsStandalone64" ], "excludePlatforms": [], "allowUnsafeCode": false,