Merge branch 'Fixes'

Assets/PlayroomKit/PlayroomKit.cs

@@ -1,5 +1,6 @@
 using UnityEngine;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Runtime.InteropServices;
 using AOT;
 using System;
@@ -57,7 +58,6 @@ public static void InsertCoin(Action callback, InitOptions options = null)
                 InsertCoinCallback = callback;
                 string optionsJson = null;
                 if (options != null) { optionsJson = SerializeInitOptions(options); }
-                Debug.Log("C# " + optionsJson);
                 InsertCoinInternal(InvokeInsertCoin, optionsJson, __OnPlayerJoinCallbackHandler, __OnQuitInternalHandler);
             }
             else
@@ -336,7 +336,7 @@ public static void SetState(string key, float value, bool reliable = false)
         {
             if (IsRunningInBrowser())
             {
-                var floatAsString = value.ToString();
+                var floatAsString = value.ToString(CultureInfo.InvariantCulture);
                 SetStateFloatInternal(key, floatAsString, reliable);
             }
             else
@@ -929,7 +929,7 @@ public void SetState(string key, float value, bool reliable = false)
             {
                 if (IsRunningInBrowser())
                 {
-                    SetPlayerStateFloatByPlayerId(id, key, value.ToString(), reliable);
+                    SetPlayerStateFloatByPlayerId(id, key, value.ToString(CultureInfo.InvariantCulture), reliable);
                 }
                 else
                 {

Assets/Plugins/PlayroomPlugin.jslib

@@ -12,6 +12,7 @@ mergeInto(LibraryManager.library, {
     // onLaunchCallback
   ) {
     function embedScript(src) {
+      script.crossOrigin = 'anonymous';
       return new Promise((resolve, reject) => {
         var script = document.createElement("script");
         script.src = src;
@@ -23,7 +24,6 @@ mergeInto(LibraryManager.library, {
     }
 
     var options = optionsJson ? JSON.parse(UTF8ToString(optionsJson)) : {};
-    // console.log(options)
 
     Promise.all([
       embedScript("https://unpkg.com/[email protected]/umd/react.development.js"),
@@ -713,23 +713,17 @@ mergeInto(LibraryManager.library, {
     }
 
     const players = window._multiplayer.getPlayers();
-    console.log(players)
 
     if (typeof players !== "object" || players === null) {
       console.error('The "players" variable is not an object:', players);
       return null;
     }
     const playerState = players[UTF8ToString(playerID)];
-    console.log(playerState)
 
     if (!playerState) {
       console.error("Player with ID", UTF8ToString(playerID), "not found.");
       return null;
     }
-
-    const p = playerState.kick()
-    console.log(p)
-
     playerState.kick().then(() => {
       dynCall('v', onKickCallBack, [])
     }).catch((error) => {

Assets/Scenes/Game.unity

@@ -141,7 +141,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &77751265
 RectTransform:
   m_ObjectHideFlags: 0
@@ -207,9 +207,9 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 330732771}
-        m_TargetAssemblyTypeName: TestManager, Assembly-CSharp
-        m_MethodName: SetStateTest
+      - m_Target: {fileID: 330732769}
+        m_TargetAssemblyTypeName: GameManager, Assembly-CSharp
+        m_MethodName: Kick
         m_Mode: 1
         m_Arguments:
           m_ObjectArgument: {fileID: 0}
@@ -454,7 +454,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: SetState
+  m_Text: Kick
 --- !u!222 &360417501
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -615,7 +615,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!114 &1036353973
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Scripts/GameManager.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using AOT;
 using Playroom;
 using UnityEngine;
@@ -16,63 +17,48 @@ public class GameManager : MonoBehaviour
     [SerializeField] private int score = 0;
     [SerializeField] private static bool playerJoined;
 
-
     private void Awake()
     {
+#if !UNITY_EDITOR && UNITY_WEBGL
+        WebGLInput.captureAllKeyboardInput = false;
+
         PlayroomKit.InsertCoin(() =>
         {
             PlayroomKit.OnPlayerJoin(AddPlayer);
-            PlayroomKit.SetState("score", score);
+            //PlayroomKit.SetState("score", score);
+            //PlayroomKit.SetState("Started", true);
+            WebGLInput.captureAllKeyboardInput = true;
         });
+#else
+#endif
     }
 
-    private void Start()
-    {
 
+    [MonoPInvokeCallback(typeof(Action))]
+    static void WaitForSate()
+    {
+        Debug.Log("Waiting for state callback");
     }
 
-
     private void Update()
     {
         if (playerJoined)
         {
             var myPlayer = PlayroomKit.MyPlayer();
             var index = players.IndexOf(myPlayer);
 
+            //Debug.Log("Started" + PlayroomKit.GetState<bool>("Started"));
 
-            /*var myDpad = PlayroomKit.DpadJoystick();
-
-
-            if (myDpad.y == "up")
-            {
-                playerGameObjects[index].GetComponent<PlayerController>().Jump();
-            }
-            if (myDpad.x == "left")
-            {
-                playerGameObjects[index].GetComponent<PlayerController>().dirX = -1;
-            }
-            else if (myDpad.x == "right")
-            {
-                playerGameObjects[index].GetComponent<PlayerController>().dirX = 1;
-            }
-            else
-            {
-                playerGameObjects[index].GetComponent<PlayerController>().dirX = 0;
-            }*/
             playerGameObjects[index].GetComponent<PlayerController>().Move();
 
-            if (Input.GetKeyDown(KeyCode.L))
-            {
-                var code = PlayroomKit.GetRoomCode();
-                Debug.Log("Room Code" + code);
-            }
-
 
             players[index].SetState("posX", playerGameObjects[index].GetComponent<Transform>().position.x);
             players[index].SetState("posY", playerGameObjects[index].GetComponent<Transform>().position.y);
 
         }
 
+
+
         for (var i = 0; i < players.Count; i++)
         {
 
@@ -91,7 +77,7 @@ private void Update()
                 if (playerGameObjects[i].GetComponent<Transform>().position.x >= 0f)
                 {
                     score += 10;
-                    PlayroomKit.SetState("score", score);
+                    //PlayroomKit.SetState("score", score);
                 }
             }
             else
@@ -102,33 +88,16 @@ private void Update()
         }
     }
 
+
     public static void AddPlayer(PlayroomKit.Player player)
     {
         GameObject playerObj = (GameObject)Instantiate(Resources.Load("Player"),
             new Vector3(Random.Range(-4, 4), Random.Range(1, 5), 0), Quaternion.identity);
 
-
-        // creates joystick
-        /*PlayroomKit.CreateJoyStick(new PlayroomKit.JoystickOptions()
-        {
-            type = "dpad",
-            buttons = new []{new PlayroomKit.ButtonOptions()
-            {
-                id = "jump",
-                label = "jump"
-            }},
-            zones = new PlayroomKit.ZoneOptions() {right = new PlayroomKit.ButtonOptions()
-            {
-                id = "right",
-                label = "right"
-            }}
-
-        });
-        */
-
         playerObj.GetComponent<SpriteRenderer>().color = player.GetProfile().color;
         Debug.Log(player.GetProfile().name + " Joined the game!" + "id: " + player.id);
 
+
         PlayerDict.Add(player.id, playerObj);
         players.Add(player);
         playerGameObjects.Add(playerObj);