gg.easy.airship 0.1.2155 → 0.1.2158
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 +4 -2
- package/Runtime/Code/Luau/LuauCore.cs +1 -1
- package/Runtime/Code/Luau/LuauScript.cs +1 -1
- package/Runtime/Code/Network/Messaging/MessagingManager.cs +5 -10
- package/Runtime/Code/Steam/SteamLuauAPI.cs +1 -1
- package/Runtime/Scenes/CoreScene.unity +447 -759
- package/ThirdParty/Mirror/Core/NetworkManager.cs +0 -1
- package/package.json +1 -1
- package/Runtime/Prefabs/Network.prefab +0 -181
- package/Runtime/Prefabs/Network.prefab.meta +0 -7
|
@@ -272,9 +272,11 @@ public class LoginApp : MonoBehaviour {
|
|
|
272
272
|
this.steamLoginButton.SetLoading(false);
|
|
273
273
|
return;
|
|
274
274
|
}
|
|
275
|
-
|
|
275
|
+
|
|
276
|
+
// Different login route is required for the playtest app.
|
|
277
|
+
var prodApp = SteamUtils.GetAppID().m_AppId == 2381730;
|
|
276
278
|
RestClient.Get(new RequestHelper() {
|
|
277
|
-
Uri = AirshipPlatformUrl.gameCoordinator + "/auth/steam/in-game",
|
|
279
|
+
Uri = AirshipPlatformUrl.gameCoordinator + (prodApp ? "/auth/steam/in-game" : "/auth/steam/in-game-playtest"),
|
|
278
280
|
Headers = new Dictionary<string, string>() {
|
|
279
281
|
{ "Authorization", steamToken }
|
|
280
282
|
},
|
|
@@ -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
|
|
|
@@ -25,7 +25,7 @@ public class LuauScript : MonoBehaviour {
|
|
|
25
25
|
public AirshipScript script;
|
|
26
26
|
|
|
27
27
|
public IntPtr thread;
|
|
28
|
-
public LuauContext context = LuauContext.Game;
|
|
28
|
+
[NonSerialized] public LuauContext context = LuauContext.Game;
|
|
29
29
|
[HideInInspector] public bool forceContext = false;
|
|
30
30
|
|
|
31
31
|
[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
|
|
@@ -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
|
}
|
|
@@ -197,7 +197,7 @@ public class SteamLuauAPI : Singleton<SteamLuauAPI> {
|
|
|
197
197
|
};
|
|
198
198
|
|
|
199
199
|
// Is friend playing Airship?
|
|
200
|
-
if (friendGameInfo.m_gameID.m_GameID ==
|
|
200
|
+
if (friendGameInfo.m_gameID.m_GameID == SteamUtils.GetAppID().m_AppId) {
|
|
201
201
|
friendInfoStruct.playingAirship = true;
|
|
202
202
|
} else if (friendGameInfo.m_gameID.IsValid()) {
|
|
203
203
|
friendInfoStruct.playingOtherGame = true;
|