From 35d0818944576a1b429f45b3b76fd504ab813377 Mon Sep 17 00:00:00 2001 From: Nikita Kruglickiy Date: Wed, 20 Mar 2024 23:26:44 +0300 Subject: [PATCH] =?UTF-8?q?=D1=8F=D1=87=D1=8F=D1=87=D1=81=D1=8F=D1=87?= =?UTF-8?q?=D1=81=D1=8F=D1=87=D1=81=D1=8F=D1=87=D1=81=D1=8F=D1=87=D1=81?= =?UTF-8?q?=D1=8F=D1=87=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Resources/Audio/Ambient/ambience_space.mp3.meta | 2 +- Assets/Scripts/Characters/Enemy/States/StunnedState.cs | 3 --- Assets/Scripts/Level/BuildModules/ProceduralPrefabs.cs | 8 ++++---- ProjectSettings/EditorBuildSettings.asset | 6 +++--- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/Assets/Resources/Audio/Ambient/ambience_space.mp3.meta b/Assets/Resources/Audio/Ambient/ambience_space.mp3.meta index a75086d..cb85fbb 100644 --- a/Assets/Resources/Audio/Ambient/ambience_space.mp3.meta +++ b/Assets/Resources/Audio/Ambient/ambience_space.mp3.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7d9afb8bb2e693e479f5cd31279695e8 +guid: b530a6af6a37b0a4fa88a6540d7436a6 AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Scripts/Characters/Enemy/States/StunnedState.cs b/Assets/Scripts/Characters/Enemy/States/StunnedState.cs index d7b5f48..ce2b889 100644 --- a/Assets/Scripts/Characters/Enemy/States/StunnedState.cs +++ b/Assets/Scripts/Characters/Enemy/States/StunnedState.cs @@ -1,8 +1,5 @@ -using System.Collections; -using Koptilnya; using Koptilnya.StateMachine; using Mirror; -using UnityEditor.Timeline.Actions; using UnityEngine; namespace Characters.Enemy.States diff --git a/Assets/Scripts/Level/BuildModules/ProceduralPrefabs.cs b/Assets/Scripts/Level/BuildModules/ProceduralPrefabs.cs index f773105..1d20f2a 100644 --- a/Assets/Scripts/Level/BuildModules/ProceduralPrefabs.cs +++ b/Assets/Scripts/Level/BuildModules/ProceduralPrefabs.cs @@ -63,10 +63,10 @@ namespace Level.BuildModules networkManager.OnPlayerSpawned += OnPlayerSpawned; - if (isServer) - { - OnPlayerSpawned(); - } + // if (isServer) + // { + // OnPlayerSpawned(); + // } } private void OnPlayerSpawned() diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index edc9650..7483b91 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -5,12 +5,12 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: - - enabled: 1 - path: Assets/Scenes/Space.unity - guid: 3a14941bb9ca9a248a675164ae301191 - enabled: 1 path: Assets/Scenes/NewMenu.unity guid: 6ddae5af01aae03478d326929e67fe9e + - enabled: 1 + path: Assets/Scenes/Space.unity + guid: 3a14941bb9ca9a248a675164ae301191 - enabled: 1 path: Assets/Scenes/Procedural.unity guid: 1a0a3f9799fdf5740a5cf473d1c67532