diff --git a/Assets/Scripts/KingScripts/KingAbilities/Boulder.cs b/Assets/Scripts/KingScripts/Boulder.cs similarity index 100% rename from Assets/Scripts/KingScripts/KingAbilities/Boulder.cs rename to Assets/Scripts/KingScripts/Boulder.cs diff --git a/Assets/Scripts/KingScripts/KingAbilities/Boulder.cs.meta b/Assets/Scripts/KingScripts/Boulder.cs.meta similarity index 100% rename from Assets/Scripts/KingScripts/KingAbilities/Boulder.cs.meta rename to Assets/Scripts/KingScripts/Boulder.cs.meta diff --git a/Assets/Scripts/KingScripts/KingAbilities/Bumper.cs b/Assets/Scripts/KingScripts/Bumper.cs similarity index 100% rename from Assets/Scripts/KingScripts/KingAbilities/Bumper.cs rename to Assets/Scripts/KingScripts/Bumper.cs diff --git a/Assets/Scripts/KingScripts/KingAbilities/Bumper.cs.meta b/Assets/Scripts/KingScripts/Bumper.cs.meta similarity index 100% rename from Assets/Scripts/KingScripts/KingAbilities/Bumper.cs.meta rename to Assets/Scripts/KingScripts/Bumper.cs.meta diff --git a/Assets/Scripts/KingScripts/KingAbilities/Goo.cs b/Assets/Scripts/KingScripts/Goo.cs similarity index 100% rename from Assets/Scripts/KingScripts/KingAbilities/Goo.cs rename to Assets/Scripts/KingScripts/Goo.cs diff --git a/Assets/Scripts/KingScripts/KingAbilities/Goo.cs.meta b/Assets/Scripts/KingScripts/Goo.cs.meta similarity index 100% rename from Assets/Scripts/KingScripts/KingAbilities/Goo.cs.meta rename to Assets/Scripts/KingScripts/Goo.cs.meta diff --git a/Assets/Scripts/KingScripts/KingAbilities/Hail.cs b/Assets/Scripts/KingScripts/Hail.cs similarity index 100% rename from Assets/Scripts/KingScripts/KingAbilities/Hail.cs rename to Assets/Scripts/KingScripts/Hail.cs diff --git a/Assets/Scripts/KingScripts/KingAbilities/Hail.cs.meta b/Assets/Scripts/KingScripts/Hail.cs.meta similarity index 100% rename from Assets/Scripts/KingScripts/KingAbilities/Hail.cs.meta rename to Assets/Scripts/KingScripts/Hail.cs.meta diff --git a/Assets/Scripts/KingScripts/KingAbilities/HailArea.cs b/Assets/Scripts/KingScripts/HailArea.cs similarity index 100% rename from Assets/Scripts/KingScripts/KingAbilities/HailArea.cs rename to Assets/Scripts/KingScripts/HailArea.cs diff --git a/Assets/Scripts/KingScripts/KingAbilities/HailArea.cs.meta b/Assets/Scripts/KingScripts/HailArea.cs.meta similarity index 100% rename from Assets/Scripts/KingScripts/KingAbilities/HailArea.cs.meta rename to Assets/Scripts/KingScripts/HailArea.cs.meta diff --git a/Assets/Scripts/KingScripts/KingAbilities/Slime.cs b/Assets/Scripts/KingScripts/Slime.cs similarity index 100% rename from Assets/Scripts/KingScripts/KingAbilities/Slime.cs rename to Assets/Scripts/KingScripts/Slime.cs diff --git a/Assets/Scripts/KingScripts/KingAbilities/Slime.cs.meta b/Assets/Scripts/KingScripts/Slime.cs.meta similarity index 100% rename from Assets/Scripts/KingScripts/KingAbilities/Slime.cs.meta rename to Assets/Scripts/KingScripts/Slime.cs.meta diff --git a/Assets/Scripts/KingScripts/KingAbilities/Wind.cs b/Assets/Scripts/KingScripts/Wind.cs similarity index 100% rename from Assets/Scripts/KingScripts/KingAbilities/Wind.cs rename to Assets/Scripts/KingScripts/Wind.cs diff --git a/Assets/Scripts/KingScripts/KingAbilities/Wind.cs.meta b/Assets/Scripts/KingScripts/Wind.cs.meta similarity index 100% rename from Assets/Scripts/KingScripts/KingAbilities/Wind.cs.meta rename to Assets/Scripts/KingScripts/Wind.cs.meta diff --git a/Assets/Scripts/Network/Game/SpawnManager.cs b/Assets/Scripts/Network/Game/SpawnManager.cs index f35367b..06839a9 100644 --- a/Assets/Scripts/Network/Game/SpawnManager.cs +++ b/Assets/Scripts/Network/Game/SpawnManager.cs @@ -28,11 +28,11 @@ public class SpawnManager : NetworkBehaviour { if (ServerGameNetPortal.Instance.clientData.TryGetValue(clientGuid, out PlayerData playerData)) { if (playerData.IsKing) { // Spawn as king - _king = Instantiate(kingPrefab, kingSpawnPoint, Quaternion.identity).gameObject; + _king = Instantiate(kingPrefab, kingSpawnPoint, Quaternion.Euler(0, 180, 0)).gameObject; _king.GetComponent().SpawnAsPlayerObject(NetworkManager.Singleton.LocalClientId, null, true); } else { // Spawn as player - _runner = Instantiate(runnerPrefab, runnersSpawnPoints[runnersSpawned], Quaternion.identity).gameObject; + _runner = Instantiate(runnerPrefab, runnersSpawnPoints[runnersSpawned], Quaternion.Euler(0, -90, 0)).gameObject; //Recreate Inventory _runner.GetComponentInChildren().UpdateEquips(playerData.pInv.NetworkItemList, this.gameObject.GetComponent().ItemDict); _runner.GetComponent().SpawnAsPlayerObject(NetworkManager.Singleton.LocalClientId, null, true); @@ -65,11 +65,11 @@ public class SpawnManager : NetworkBehaviour { if (ServerGameNetPortal.Instance.clientData.TryGetValue(clientGuid, out PlayerData playerData)) { if (playerData.IsKing) { // Spawn as king - _king = Instantiate(kingPrefab, kingSpawnPoint, Quaternion.identity).gameObject; + _king = Instantiate(kingPrefab, kingSpawnPoint, Quaternion.Euler(0, 180, 0)).gameObject; _king.GetComponent().SpawnAsPlayerObject(clientId, null, true); } else { // Spawn as player - _runner = Instantiate(runnerPrefab, runnersSpawnPoints[runnersSpawned], Quaternion.identity).gameObject; + _runner = Instantiate(runnerPrefab, runnersSpawnPoints[runnersSpawned], Quaternion.Euler(0, -90, 0)).gameObject; //Recreate Inventory _runner.GetComponentInChildren().UpdateEquips(playerData.pInv.NetworkItemList, this.gameObject.GetComponent().ItemDict); _runner.GetComponent().SpawnAsPlayerObject(clientId, null, true); diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 35ad120..1bbb9a8 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,34 +6,34 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 + value: 22424703114646680e0b0227036c7b151b180b650d262f3d192c0e27d1e33136e7a923e7ee2e26 flags: 0 RecentlyUsedScenePath-1: value: 22424703114646680e0b0227036c7b151b180b6519016b0515163936efef2776f7e93ffdfe flags: 0 RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c731f1415016439262f2434 + value: 22424703114646680e0b0227036c7b151b180b652b3a27292f260573f1e33136e7a923e7ee2e26 flags: 0 RecentlyUsedScenePath-3: value: 22424703114646680e0b0227036c7b151b180b652b3a27292f260573f1e33136e7a923e7ee2e26 flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c7b151b180b652b3a27292f260573f1e33136e7a923e7ee2e26 + value: 22424703114646680e0b0227036c7b151b180b650e3a233126281f3fe7c23837e1ec25a7f234362820 flags: 0 RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c7b151b180b650e3a233126281f3fe7c23837e1ec25a7f234362820 + value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 flags: 0 RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c7b151b180b650e3a233126281f3fe7c23837e1ec25a7f234362820 + value: 22424703114646680e0b0227036c7b151b180b65072128370c2b143febf4312bd6e225fda92f31352d1b flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c6f1f05033f2b212d68252320092a + value: 22424703114646680e0b0227036c731f1415016439262f2434 flags: 0 RecentlyUsedScenePath-8: value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb + value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb flags: 0 UnityRemoteCompression: value: 337f73