diff --git a/BaseProject/Assets/PusherWebsocketUnity/Packages/PusherClient.2.3.1/PusherClient.2.3.1.nupkg b/BaseProject/Assets/PusherWebsocketUnity/Packages/PusherClient.2.3.1/PusherClient.2.3.1.nupkg index c20e8f9..228a580 100644 Binary files a/BaseProject/Assets/PusherWebsocketUnity/Packages/PusherClient.2.3.1/PusherClient.2.3.1.nupkg and b/BaseProject/Assets/PusherWebsocketUnity/Packages/PusherClient.2.3.1/PusherClient.2.3.1.nupkg differ diff --git a/BaseProject/Assets/PusherWebsocketUnity/Packages/PusherClient.2.3.1/lib/net472/PusherClient.dll b/BaseProject/Assets/PusherWebsocketUnity/Packages/PusherClient.2.3.1/lib/net472/PusherClient.dll index c33d3ed..a6ff3b6 100644 Binary files a/BaseProject/Assets/PusherWebsocketUnity/Packages/PusherClient.2.3.1/lib/net472/PusherClient.dll and b/BaseProject/Assets/PusherWebsocketUnity/Packages/PusherClient.2.3.1/lib/net472/PusherClient.dll differ diff --git a/BaseProject/UserSettings/Layouts/default-2022.dwlt b/BaseProject/UserSettings/Layouts/default-2022.dwlt index f59952e..9ef261b 100644 --- a/BaseProject/UserSettings/Layouts/default-2022.dwlt +++ b/BaseProject/UserSettings/Layouts/default-2022.dwlt @@ -14,10 +14,10 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 10 - y: 76 - width: 1492 - height: 896 + x: 173 + y: 72 + width: 1329 + height: 900 m_ShowMode: 4 m_Title: Project m_RootView: {fileID: 6} @@ -43,12 +43,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 1492 - height: 846 + width: 1329 + height: 850 m_MinSize: {x: 503, y: 321} m_MaxSize: {x: 16192, y: 12117} vertical: 0 - controlID: 17 + controlID: 39 --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -64,10 +64,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1139.5 + x: 1020 y: 0 - width: 352.5 - height: 846 + width: 309 + height: 850 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 13} @@ -92,8 +92,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 282.5 - height: 501 + width: 247 + height: 499.5 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 14} @@ -117,9 +117,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 501 - width: 1139.5 - height: 345 + y: 499.5 + width: 1020 + height: 350.5 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 12} @@ -148,8 +148,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1492 - height: 896 + width: 1329 + height: 900 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -173,7 +173,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1492 + width: 1329 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -194,8 +194,8 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 876 - width: 1492 + y: 880 + width: 1329 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -218,12 +218,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1139.5 - height: 846 + width: 1020 + height: 850 m_MinSize: {x: 403, y: 321} m_MaxSize: {x: 8096, y: 12117} vertical: 1 - controlID: 18 + controlID: 40 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -243,12 +243,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1139.5 - height: 501 + width: 1020 + height: 499.5 m_MinSize: {x: 403, y: 221} m_MaxSize: {x: 8003, y: 4021} vertical: 0 - controlID: 19 + controlID: 41 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -259,23 +259,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView + m_Name: GameView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 282.5 + x: 247 y: 0 - width: 857 - height: 501 + width: 773 + height: 499.5 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 15} + m_ActualView: {fileID: 16} m_Panes: - {fileID: 15} - {fileID: 16} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -297,10 +297,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 10 - y: 607 - width: 1138.5 - height: 324 + x: 173 + y: 601.5 + width: 1019 + height: 329.5 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -330,26 +330,26 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 36} - m_SelectedIDs: 3c580000 - m_LastClickedID: 22588 - m_ExpandedIDs: 000000003a58000042580000685800007458000000ca9a3bffffff7f + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 66580000 + m_LastClickedID: 22630 + m_ExpandedIDs: 00000000585800005a5800005c5800005e5800006658000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: PusherWebsocketUnity + m_OriginalName: PusherWebsocketUnity m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: 22630 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 5} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -361,7 +361,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000003a5800003c580000 + m_ExpandedIDs: 00000000585800005a5800005c5800005e580000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -438,10 +438,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1149.5 - y: 106 - width: 351.5 - height: 825 + x: 1193 + y: 102 + width: 308 + height: 829 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -480,10 +480,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 10 - y: 106 - width: 281.5 - height: 480 + x: 173 + y: 102 + width: 246 + height: 478.5 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -493,7 +493,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 38fbffff + m_ExpandedIDs: 36fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -538,10 +538,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 292.5 - y: 106 - width: 855 - height: 480 + x: 420 + y: 102 + width: 771 + height: 478.5 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -876,10 +876,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 292.5 - y: 106 - width: 855 - height: 480 + x: 420 + y: 102 + width: 771 + height: 478.5 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -890,7 +890,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 855, y: 459} + m_TargetSize: {x: 771, y: 457.5} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -910,10 +910,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -213.75 - m_HBaseRangeMax: 213.75 - m_VBaseRangeMin: -114.75 - m_VBaseRangeMax: 114.75 + m_HBaseRangeMin: -192.75 + m_HBaseRangeMax: 192.75 + m_VBaseRangeMin: -114.375 + m_VBaseRangeMax: 114.375 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -931,23 +931,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 855 - height: 459 + width: 771 + height: 457.5 m_Scale: {x: 2, y: 2} - m_Translation: {x: 427.5, y: 229.5} + m_Translation: {x: 385.5, y: 228.75} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -213.75 - y: -114.75 - width: 427.5 - height: 229.5 + x: -192.75 + y: -114.375 + width: 385.5 + height: 228.75 m_MinimalGUI: 1 m_defaultScale: 2 - m_LastWindowPixelSize: {x: 1710, y: 960} + m_LastWindowPixelSize: {x: 1542, y: 957} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 diff --git a/Builds/PusherWebsocketUnity-2.3.1+251003.unitypackage b/Builds/PusherWebsocketUnity-2.3.1+251003.unitypackage new file mode 100644 index 0000000..09b734e Binary files /dev/null and b/Builds/PusherWebsocketUnity-2.3.1+251003.unitypackage differ diff --git a/Builds/PusherWebsocketUnity-2.3.1.unitypackage b/Builds/PusherWebsocketUnity-2.3.1.unitypackage deleted file mode 100644 index 73d31cf..0000000 Binary files a/Builds/PusherWebsocketUnity-2.3.1.unitypackage and /dev/null differ diff --git a/Examples/1-realtime-controlled-2d-game/RealtimeControlled2dGame/Assets/Packages/PusherClient.2.3.1/PusherClient.2.3.1.nupkg b/Examples/1-realtime-controlled-2d-game/RealtimeControlled2dGame/Assets/Packages/PusherClient.2.3.1/PusherClient.2.3.1.nupkg index c20e8f9..228a580 100644 Binary files a/Examples/1-realtime-controlled-2d-game/RealtimeControlled2dGame/Assets/Packages/PusherClient.2.3.1/PusherClient.2.3.1.nupkg and b/Examples/1-realtime-controlled-2d-game/RealtimeControlled2dGame/Assets/Packages/PusherClient.2.3.1/PusherClient.2.3.1.nupkg differ diff --git a/Examples/1-realtime-controlled-2d-game/RealtimeControlled2dGame/Assets/Packages/PusherClient.2.3.1/lib/net472/PusherClient.dll b/Examples/1-realtime-controlled-2d-game/RealtimeControlled2dGame/Assets/Packages/PusherClient.2.3.1/lib/net472/PusherClient.dll index c33d3ed..a6ff3b6 100644 Binary files a/Examples/1-realtime-controlled-2d-game/RealtimeControlled2dGame/Assets/Packages/PusherClient.2.3.1/lib/net472/PusherClient.dll and b/Examples/1-realtime-controlled-2d-game/RealtimeControlled2dGame/Assets/Packages/PusherClient.2.3.1/lib/net472/PusherClient.dll differ diff --git a/README.md b/README.md index 01d20d2..6c1e54e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # Pusher Channels Unity Client Library + This library packages [the official WebSocket .NET SDK for Pusher Channels](https://github.com/pusher/pusher-websocket-dotnet) as a `.unitypackage` and an `UPM package` to make it easier to use in [Unity](https://unity.com/) projects. For API documentation, see [the pusher-websocket-dotnet README](https://github.com/pusher/pusher-websocket-dotnet). ## Repository Structure @@ -22,10 +23,10 @@ This library packages [the official WebSocket .NET SDK for Pusher Channels](http ### 2 Install #### 2.1 Install it via unitypackage -2.1.1 - Download the latest `PusherWebsocketUnity-2.3.1.unitypackage` from [releases](/../../releases)
+2.1.1 - Download the latest `PusherWebsocketUnity-2.3.1+251003.unitypackage` from [releases](/../../releases)
2.1.2 - Open a new/existing Unity project and make sure it is being opened by a [supported version of Unity](#unity-versions-support)
2.1.3 - [if your Unity version is **2018.x.x**] Make sure that under `Edit -> Project Settings -> Player` the `Configuration -> Scripting Runtime Version` is set to **.NET 4.x Equivalent**.
-2.1.4 - Click on `Assets -> Import Package -> Custom Package...`, find and select the `PusherWebsocketUnity-2.3.1.unitypackage` and click *Import* on the `Import Unity Package` window.
+2.1.4 - Click on `Assets -> Import Package -> Custom Package...`, find and select the `PusherWebsocketUnity-2.3.1+251003.unitypackage` and click *Import* on the `Import Unity Package` window.
#### 2.2 Install it via Unity Package Manager (UPM) **WARNING** this method works only if your version of Unity is **2018.3.x or greater**, if you don't satisfy that, use the [unitypackage](#2-install) method.
@@ -35,7 +36,7 @@ This library packages [the official WebSocket .NET SDK for Pusher Channels](http { "dependencies": { ... - "com.pusher.pusherwebsocketunity": "https://github.com/pusher/pusher-websocket-unity.git#2.3.1" + "com.pusher.pusherwebsocketunity": "https://github.com/pusher/pusher-websocket-unity.git#2.3.1+251003" } } ``` @@ -72,7 +73,7 @@ From: ``` To: ```json -"com.pusher.pusherwebsocketunity": "https://github.com/pusher/pusher-websocket-unity.git#2.3.1" +"com.pusher.pusherwebsocketunity": "https://github.com/pusher/pusher-websocket-unity.git#2.3.1+251003" ``` ## Unity Platforms Support