gg.easy.airship 0.1.2156 → 0.1.2159
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Runtime/Code/CoreUI/Login/LoginApp.cs +6 -1
- package/Runtime/Code/Luau/LuauCore.cs +1 -1
- package/Runtime/Code/Network/Messaging/MessagingManager.cs +5 -10
- package/Runtime/Scenes/CoreScene.unity +447 -759
- package/ThirdParty/Mirror/Core/NetworkManager.cs +12 -2
- package/package.json +1 -1
- package/Runtime/Prefabs/Network.prefab +0 -181
- package/Runtime/Prefabs/Network.prefab.meta +0 -7
|
@@ -274,7 +274,12 @@ public class LoginApp : MonoBehaviour {
|
|
|
274
274
|
}
|
|
275
275
|
|
|
276
276
|
// Different login route is required for the playtest app.
|
|
277
|
-
var prodApp =
|
|
277
|
+
var prodApp = true;
|
|
278
|
+
#if STEAMWORKS_NET
|
|
279
|
+
prodApp = SteamUtils.GetAppID().m_AppId == 2381730;
|
|
280
|
+
#else
|
|
281
|
+
print("Pressed login with steam but STEAMWORKS_NET is not enabled.");
|
|
282
|
+
#endif
|
|
278
283
|
RestClient.Get(new RequestHelper() {
|
|
279
284
|
Uri = AirshipPlatformUrl.gameCoordinator + (prodApp ? "/auth/steam/in-game" : "/auth/steam/in-game-playtest"),
|
|
280
285
|
Headers = new Dictionary<string, string>() {
|
|
@@ -83,7 +83,7 @@ public partial class LuauCore : MonoBehaviour {
|
|
|
83
83
|
private static Type actionType = typeof(Action);
|
|
84
84
|
|
|
85
85
|
private static readonly string[] protectedScenesNames = {
|
|
86
|
-
"corescene", "mainmenu", "login", "disconnected", "airshipupdateapp"
|
|
86
|
+
"corescene", "mainmenu", "login", "disconnected", "airshipupdateapp", "dontdestroyonload",
|
|
87
87
|
};
|
|
88
88
|
private static HashSet<int> protectedSceneHandles = new HashSet<int>();
|
|
89
89
|
|
|
@@ -52,25 +52,20 @@ public class MessagingManager : Singleton<MessagingManager>
|
|
|
52
52
|
|
|
53
53
|
private static ServerBootstrap serverBootstrap;
|
|
54
54
|
|
|
55
|
-
private void Awake()
|
|
56
|
-
{
|
|
55
|
+
private void Awake() {
|
|
57
56
|
DontDestroyOnLoad(this);
|
|
58
57
|
}
|
|
59
58
|
|
|
60
|
-
private void Start()
|
|
61
|
-
{
|
|
59
|
+
private void Start() {
|
|
62
60
|
MessagingManager.serverBootstrap = FindFirstObjectByType<ServerBootstrap>();
|
|
63
61
|
}
|
|
64
62
|
|
|
65
|
-
public static async Task<bool> ConnectAsyncInternal()
|
|
66
|
-
|
|
67
|
-
if (RunCore.IsEditor())
|
|
68
|
-
{
|
|
63
|
+
public static async Task<bool> ConnectAsyncInternal() {
|
|
64
|
+
if (RunCore.IsEditor()) {
|
|
69
65
|
return false;
|
|
70
66
|
}
|
|
71
67
|
|
|
72
|
-
if (!MessagingManager.serverBootstrap)
|
|
73
|
-
{
|
|
68
|
+
if (!MessagingManager.serverBootstrap) {
|
|
74
69
|
Debug.LogError("MessagingManager: ServerBootstrap not found in scene. Please ensure it is present.");
|
|
75
70
|
return false;
|
|
76
71
|
}
|