Set max players to 6 and set actor color to be fixed rather than random

WearableComputerLab · Mar 15, 2022 · 763abdb · 763abdb
1 parent 25e1560
commit 763abdb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/Assets/CoReality/Scripts/AvatarSystem/AvatarModule.cs b/Assets/CoReality/Scripts/AvatarSystem/AvatarModule.cs
@@ -84,7 +84,7 @@ public static Material DefaultHandMaterial
         "Vague",
         "Rare",
         "Jolly"
-    };
+        };
 
         [SerializeField]
         private List<string> _randomNouns = new List<string>{
@@ -103,7 +103,7 @@ public static Material DefaultHandMaterial
         "Calculator",
         "Texture",
         "Force"
-    };
+        };
 
         [SerializeField]
         private List<Color> _randomColors = new List<Color>{
@@ -113,7 +113,7 @@ public static Material DefaultHandMaterial
         Color.blue,
         Color.cyan,
         Color.magenta,
-    };
+        };
 
         //--------------------------------------
 
@@ -202,9 +202,12 @@ private void SpawnAvatar(bool remote, int viewID = -1)
             //Set color
             _localAvatar.Name = _randomAdjectives[UnityEngine.Random.Range(0, _randomAdjectives.Count)] + " "
                                 + _randomNouns[UnityEngine.Random.Range(0, _randomNouns.Count)];
-            _localAvatar.Color = _randomColors[UnityEngine.Random.Range(0, _randomColors.Count)];
 
-            print("Spawn Avatar End");
+            //Set the avatar's color to the actor number
+            int actorNum = PhotonNetwork.LocalPlayer.ActorNumber;
+            if (actorNum >= 0) //Ensure not -1
+                _localAvatar.Color = _randomColors[PhotonNetwork.LocalPlayer.ActorNumber];
+
         }
 
         /// <summary>

diff --git a/Assets/CoReality/Scripts/NetworkModule.cs b/Assets/CoReality/Scripts/NetworkModule.cs
@@ -172,7 +172,7 @@ public void OnConnectedToMaster()
                 {
                     IsOpen = true,
                     IsVisible = true,
-                    MaxPlayers = 0,
+                    MaxPlayers = 6,
                     PublishUserId = true,
                     CleanupCacheOnLeave = true
                 },