From fb4dd3e80179f81817a6451f4352de21ff949555 Mon Sep 17 00:00:00 2001 From: Jens Pitkanen Date: Mon, 10 Aug 2020 03:50:25 +0300 Subject: [PATCH] Fix misc --- Assets/GameObjects/Prefabs/Player.prefab | 6 +++--- Assets/Scripts/Interface/StatScreen.cs | 2 +- Assets/Scripts/Networking/Instances/Server.cs | 1 - ProjectSettings/DynamicsManager.asset | 2 +- ProjectSettings/TimeManager.asset | 4 ++-- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Assets/GameObjects/Prefabs/Player.prefab b/Assets/GameObjects/Prefabs/Player.prefab index 3023d25..4a8d061 100644 --- a/Assets/GameObjects/Prefabs/Player.prefab +++ b/Assets/GameObjects/Prefabs/Player.prefab @@ -535,13 +535,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7391558913556166741} - m_LocalRotation: {x: -0.16313043, y: -0, z: -0, w: 0.9866046} - m_LocalPosition: {x: 0, y: 1.86, z: -0.16} + m_LocalRotation: {x: 0.16312791, y: 0, z: 0, w: 0.9866049} + m_LocalPosition: {x: 0, y: 1.86, z: 0.16} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7391558912774766616} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: -18.777, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 18.777, y: 0, z: 0} --- !u!65 &7391558913556166743 BoxCollider: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Interface/StatScreen.cs b/Assets/Scripts/Interface/StatScreen.cs index cefc1ea..74a410c 100644 --- a/Assets/Scripts/Interface/StatScreen.cs +++ b/Assets/Scripts/Interface/StatScreen.cs @@ -90,7 +90,7 @@ namespace NeonTea.Quakeball.Interface { public void AddRow() { GameObject rowobj = GameObject.Instantiate(RowPrefab); - rowobj.transform.parent = BackroundPanel; + rowobj.transform.SetParent(BackroundPanel, false); RectTransform row = rowobj.GetComponent(); Rows.Add(row); diff --git a/Assets/Scripts/Networking/Instances/Server.cs b/Assets/Scripts/Networking/Instances/Server.cs index 31e253a..b763419 100644 --- a/Assets/Scripts/Networking/Instances/Server.cs +++ b/Assets/Scripts/Networking/Instances/Server.cs @@ -99,7 +99,6 @@ namespace NeonTea.Quakeball.Networking.Instances { public override void Handle(Connection conn, Packet packet) { if (packet is ReadyPckt) { - Debug.Log("Got ready!"); if (Players[conn.uid].Controlled == null) { NetPlayer player = Players[conn.uid]; Player obj = Net.SpawnPlayer(GameMaster.GetSpawn(player)).GetComponent(); diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset index 70465fe..53ce5aa 100644 --- a/ProjectSettings/DynamicsManager.asset +++ b/ProjectSettings/DynamicsManager.asset @@ -19,7 +19,7 @@ PhysicsManager: m_ClothInterCollisionStiffness: 0 m_ContactsGeneration: 1 m_LayerCollisionMatrix: ffecffffffecffffffecffffffffffffffecffffffecffffffffffffffffffffc8d1ffffc8eaffffffecffffffeeffffc8e1fffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - m_AutoSimulation: 1 + m_AutoSimulation: 0 m_AutoSyncTransforms: 0 m_ReuseCollisionCallbacks: 1 m_ClothInterCollisionSettingsToggle: 0 diff --git a/ProjectSettings/TimeManager.asset b/ProjectSettings/TimeManager.asset index 558a017..5de188c 100644 --- a/ProjectSettings/TimeManager.asset +++ b/ProjectSettings/TimeManager.asset @@ -3,7 +3,7 @@ --- !u!5 &1 TimeManager: m_ObjectHideFlags: 0 - Fixed Timestep: 0.02 + Fixed Timestep: 0.0333333 Maximum Allowed Timestep: 0.33333334 m_TimeScale: 1 - Maximum Particle Timestep: 0.03 + Maximum Particle Timestep: 0.0333333