Something

PereViader · Jun 5, 2017 · 606c964 · 606c964
1 parent 4baef21
commit 606c964
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 6 deletions.
diff --git a/Assets/Unity/Scripts/GeneralScripts/GameScripts/GameStarter.cs b/Assets/Unity/Scripts/GeneralScripts/GameScripts/GameStarter.cs
@@ -48,7 +48,7 @@ void OnConnectedToMaster()
     void CreateRoom()
     {
         RoomOptions roomOptions = GameModeFabric.ConstructRoomOptionsForGameMode(gameMode);
-        TypedLobby sqlLobby = GameModeFabric.ConstructTyppedLobby();
+        TypedLobby sqlLobby = GameModeFabric.ConstructTypedLobby();
         PhotonNetwork.CreateRoom(null, roomOptions, sqlLobby);
     }
 

diff --git a/Assets/CameraFacingBillboard.cs → ...ts/PlayerScripts/CameraFacingBillboard.cs b/Assets/CameraFacingBillboard.cs → ...ts/PlayerScripts/CameraFacingBillboard.cs
diff --git a/Assets/CameraFacingBillboard.cs.meta → ...ayerScripts/CameraFacingBillboard.cs.meta b/Assets/CameraFacingBillboard.cs.meta → ...ayerScripts/CameraFacingBillboard.cs.meta
diff --git a/Assets/Unity/Scripts/SpecificScripts/Capture/Capture_AreaController.cs b/Assets/Unity/Scripts/SpecificScripts/Capture/Capture_AreaController.cs
@@ -36,8 +36,14 @@ void Awake()
         gameManager = Component.FindObjectOfType<Capture_GameManager>();
     }
 
-	// Update is called once per frame
 	void Update () {
+        /*if ( !isCaptured && Input.GetKeyDown(KeyCode.L) )
+        {
+            gameManager.Score(1, 0);
+            isCaptured = true;
+            return;
+        }*/
+
         if (PhotonNetwork.isMasterClient && !isCaptured)
         {
             UpdateCapture();

diff --git a/Assets/Unity/Scripts/SpecificScripts/Capture/Capture_AreaManager.cs b/Assets/Unity/Scripts/SpecificScripts/Capture/Capture_AreaManager.cs
@@ -62,7 +62,7 @@ Transform getDiferentRandomAreaPosition(Transform previousArea)
         do
         {
             newCapturePosition = GetRandomCapturePosition();
-        } while (newCapturePosition == previousArea);
+        } while (previousArea != null && newCapturePosition.position == previousArea.position);
         return newCapturePosition;
     }
 

diff --git a/Assets/KingOfTheHill_ExperienceManager.cs → ...heHill/KingOfTheHill_ExperienceManager.cs b/Assets/KingOfTheHill_ExperienceManager.cs → ...heHill/KingOfTheHill_ExperienceManager.cs
diff --git a/...s/KingOfTheHill_ExperienceManager.cs.meta → ...l/KingOfTheHill_ExperienceManager.cs.meta b/...s/KingOfTheHill_ExperienceManager.cs.meta → ...l/KingOfTheHill_ExperienceManager.cs.meta
diff --git a/Assets/Unity/Scripts/SpecificScripts/LobbyScripts/GameLobbyManager.cs b/Assets/Unity/Scripts/SpecificScripts/LobbyScripts/GameLobbyManager.cs
@@ -44,7 +44,7 @@ void JoinOrCreateGame()
     {
         if ( desiredGameModes != null )
         {
-            TypedLobby sqlLobby = GameModeFabric.ConstructTyppedLobby();
+            TypedLobby sqlLobby = GameModeFabric.ConstructTypedLobby();
             string[] sqlLobbyGameModeOptions = desiredGameModes.Select(x => RoomProperties.GameMode + "=" + (int)x).ToArray();
             string sqlLobbyFilter = string.Join(" OR ", sqlLobbyGameModeOptions);
             PhotonNetwork.JoinRandomRoom(null, 0, MatchmakingMode.FillRoom, sqlLobby, sqlLobbyFilter);
@@ -69,7 +69,7 @@ void OnPhotonRandomJoinFailed()
     void CreateRoom(GameMode gameMode)
     {
         RoomOptions roomOptions = GameModeFabric.ConstructRoomOptionsForGameMode(gameMode);
-        TypedLobby sqlLobby = GameModeFabric.ConstructTyppedLobby();
+        TypedLobby sqlLobby = GameModeFabric.ConstructTypedLobby();
         PhotonNetwork.CreateRoom(null, roomOptions, sqlLobby);
     }
 

diff --git a/Assets/Unity/Scripts/StaticClassesEnums/GameModeFabric.cs b/Assets/Unity/Scripts/StaticClassesEnums/GameModeFabric.cs
@@ -24,7 +24,7 @@ public static RoomOptions ConstructRoomOptionsForGameMode(GameMode gameMode)
         return roomOptions;
     }
 
-    public static TypedLobby ConstructTyppedLobby()
+    public static TypedLobby ConstructTypedLobby()
     {
         return new TypedLobby("gameLobby", LobbyType.SqlLobby);
     }