From 9b2fcd2ddc190db8895375890165ca87af234278 Mon Sep 17 00:00:00 2001 From: tudor <7089284+tudddorrr@users.noreply.github.com> Date: Thu, 25 Jul 2024 11:35:50 +0100 Subject: [PATCH 1/3] remove version name from package --- .github/workflows/create-release.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 099eb2e..650ad6d 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -53,11 +53,11 @@ jobs: cd Release npm pack - - name: Set itch package path - id: find-package + - name: Remove the version from the artifact name run: | - filepath="`ls Release | grep .tgz`" - echo "filepath=$filepath" >> $GITHUB_OUTPUT + filepath=$(ls Release/*.tgz) + new_filepath=$(echo "$filepath" | sed -E 's/-[0-9]+\.[0-9]+\.[0-9]+\.tgz$/.tgz/') + mv "$filepath" "$new_filepath" - name: Upload to itch uses: manleydev/butler-publish-itchio-action@master @@ -66,7 +66,7 @@ jobs: CHANNEL: package ITCH_GAME: talo-unity ITCH_USER: sleepystudios - PACKAGE: Release/${{ steps.find-package.outputs.filepath }} + PACKAGE: Release/com.trytalo.talo.tgz VERSION: ${{ github.ref_name }} - name: Create release From 71162a44d85c05c29c69e1e298f4cac377f5dbae Mon Sep 17 00:00:00 2001 From: tudor <7089284+tudddorrr@users.noreply.github.com> Date: Fri, 26 Jul 2024 16:34:59 +0100 Subject: [PATCH 2/3] add toggle verification function --- .../com.trytalo.talo/Runtime/PlayerAuthAPI.cs | 11 + .../PlayerAuthToggleVerificationRequest.cs | 10 + ...layerAuthToggleVerificationRequest.cs.meta | 11 + UserSettings/Layouts/default-2022.dwlt | 214 +++++------------- 4 files changed, 85 insertions(+), 161 deletions(-) create mode 100644 Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthToggleVerificationRequest.cs create mode 100644 Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthToggleVerificationRequest.cs.meta diff --git a/Packages/com.trytalo.talo/Runtime/PlayerAuthAPI.cs b/Packages/com.trytalo.talo/Runtime/PlayerAuthAPI.cs index bef6e3b..709d790 100644 --- a/Packages/com.trytalo.talo/Runtime/PlayerAuthAPI.cs +++ b/Packages/com.trytalo.talo/Runtime/PlayerAuthAPI.cs @@ -115,5 +115,16 @@ public async Task ResetPassword(string code, string password) }); await Call(uri, "POST", content); } + + public async Task ToggleVerification(string currentPassword, bool verificationEnabled, string email = "") + { + var uri = new Uri(baseUrl + "/toggle_verification"); + string content = JsonUtility.ToJson(new PlayerAuthToggleVerificationRequest { + currentPassword = currentPassword, + verificationEnabled = verificationEnabled, + email = email + }); + await Call(uri, "PATCH", content); + } } } diff --git a/Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthToggleVerificationRequest.cs b/Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthToggleVerificationRequest.cs new file mode 100644 index 0000000..e77017d --- /dev/null +++ b/Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthToggleVerificationRequest.cs @@ -0,0 +1,10 @@ +namespace TaloGameServices +{ + [System.Serializable] + public class PlayerAuthToggleVerificationRequest + { + public string currentPassword; + public bool verificationEnabled; + public string email; + } +} diff --git a/Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthToggleVerificationRequest.cs.meta b/Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthToggleVerificationRequest.cs.meta new file mode 100644 index 0000000..dca2827 --- /dev/null +++ b/Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthToggleVerificationRequest.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b7f250769174c481c915b8bb72dda91f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index 87f61a4..2525d24 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -1,30 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: --- !u!114 &1 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_PixelRect: - serializedVersion: 2 - x: 20 - y: 72 - width: 1407 - height: 837 - m_ShowMode: 0 - m_Title: UI Builder - m_RootView: {fileID: 4} - m_MinSize: {x: 200, y: 221} - m_MaxSize: {x: 4000, y: 4021} - m_Maximized: 0 ---- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -43,62 +19,12 @@ MonoBehaviour: width: 1800 height: 1097 m_ShowMode: 4 - m_Title: Console - m_RootView: {fileID: 9} + m_Title: Game + m_RootView: {fileID: 6} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 1 ---- !u!114 &3 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: Builder - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1407 - height: 837 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 15} - m_Panes: - - {fileID: 15} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &4 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 3} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1407 - height: 837 - m_MinSize: {x: 200, y: 221} - m_MaxSize: {x: 4000, y: 4021} - vertical: 0 - controlID: 202 ---- !u!114 &5 +--- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -111,8 +37,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 12} - - {fileID: 6} + - {fileID: 9} + - {fileID: 3} m_Position: serializedVersion: 2 x: 0 @@ -122,8 +48,8 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 15 ---- !u!114 &6 + controlID: 40 +--- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -144,12 +70,12 @@ MonoBehaviour: height: 1047 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 17} + m_ActualView: {fileID: 13} m_Panes: - - {fileID: 17} + - {fileID: 13} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &7 +--- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -168,14 +94,14 @@ MonoBehaviour: y: 0 width: 338.5 height: 621.5 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 18} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 14} m_Panes: - - {fileID: 18} + - {fileID: 14} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &8 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -196,13 +122,13 @@ MonoBehaviour: height: 425.5 m_MinSize: {x: 101, y: 121} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 21} + m_ActualView: {fileID: 17} m_Panes: - - {fileID: 16} - - {fileID: 21} + - {fileID: 12} + - {fileID: 17} m_Selected: 1 m_LastSelected: 0 ---- !u!114 &9 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -215,9 +141,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 10} - - {fileID: 5} - - {fileID: 11} + - {fileID: 7} + - {fileID: 2} + - {fileID: 8} m_Position: serializedVersion: 2 x: 0 @@ -230,7 +156,7 @@ MonoBehaviour: m_TopViewHeight: 30 m_UseBottomView: 1 m_BottomViewHeight: 20 ---- !u!114 &10 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -252,7 +178,7 @@ MonoBehaviour: m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &11 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -273,7 +199,7 @@ MonoBehaviour: height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &12 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -286,8 +212,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 13} - - {fileID: 8} + - {fileID: 10} + - {fileID: 5} m_Position: serializedVersion: 2 x: 0 @@ -297,8 +223,8 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 16 ---- !u!114 &13 + controlID: 41 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -311,8 +237,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 7} - - {fileID: 14} + - {fileID: 4} + - {fileID: 11} m_Position: serializedVersion: 2 x: 0 @@ -322,8 +248,8 @@ MonoBehaviour: m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 17 ---- !u!114 &14 + controlID: 42 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -344,47 +270,13 @@ MonoBehaviour: height: 621.5 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 19} + m_ActualView: {fileID: 15} m_Panes: - - {fileID: 19} - - {fileID: 20} + - {fileID: 15} + - {fileID: 16} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &15 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 13999, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: UI Builder - m_Image: {fileID: -3932862461143797134, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 20 - y: 72 - width: 1407 - height: 816 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 ---- !u!114 &16 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -429,7 +321,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Samples/AuthenticationDemo/UI + - Assets/Samples m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -444,9 +336,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: c2460000 - m_LastClickedID: 18114 - m_ExpandedIDs: 000000007a4600007c4600007e46000080460000824600008446000086460000884600008a4600008c4600009246000000ca9a3bffffff7f + m_SelectedIDs: 10470000 + m_LastClickedID: 18192 + m_ExpandedIDs: 000000000e47000010470000124700001447000016470000184700001a4700001c4700001e47000020470000224700002447000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -474,7 +366,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000007a4600007c4600007e46000080460000824600008446000086460000884600008a4600008c460000 + m_ExpandedIDs: 000000000e47000010470000124700001447000016470000184700001a4700001c4700001e470000204700002247000024470000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -499,8 +391,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 16460000 - m_LastClickedInstanceID: 17942 + m_SelectedInstanceIDs: 50460000 + m_LastClickedInstanceID: 18000 m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c6230000 m_RenameOverlay: @@ -530,7 +422,7 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &17 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -577,7 +469,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &18 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -614,9 +506,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 16460000 - m_LastClickedID: 0 - m_ExpandedIDs: 28fbffff02460000 + m_SelectedIDs: 50460000 + m_LastClickedID: 18000 + m_ExpandedIDs: 50faffff50460000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -632,7 +524,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 7} + m_ClientGUIView: {fileID: 4} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -640,7 +532,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &19 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -997,7 +889,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &20 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1095,7 +987,7 @@ MonoBehaviour: m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &21 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} From cf11f193b693f91d61aaabc5c505633983d1c7e3 Mon Sep 17 00:00:00 2001 From: tudor <7089284+tudddorrr@users.noreply.github.com> Date: Fri, 26 Jul 2024 16:53:09 +0100 Subject: [PATCH 3/3] 0.20.0 --- Packages/com.trytalo.talo/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Packages/com.trytalo.talo/package.json b/Packages/com.trytalo.talo/package.json index b4bd1d0..98ee4aa 100644 --- a/Packages/com.trytalo.talo/package.json +++ b/Packages/com.trytalo.talo/package.json @@ -1,6 +1,6 @@ { "name": "com.trytalo.talo", - "version": "0.19.0", + "version": "0.20.0", "displayName": "Talo Game Services", "description": "Talo (https://trytalo.com) is an open-source game backend with services designed to help you build games faster. You can currently:\n\n- Identify and authenticate players\n- Store persistent data across players\n- Track events (levelling up, finding loot, etc)\n- Display high scores with leaderboards\n- Store and load player saves\n- Load game config options and flags from the cloud\n- Get feedback directly from your players", "unity": "2022.3",