From 4d27f34ecfbbe5cad3131cf60628e7150ab890c3 Mon Sep 17 00:00:00 2001 From: DyatelO Date: Mon, 25 Oct 2021 20:49:36 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=BE=D1=81=D0=B2=D0=B5=D1=89=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=BD=D0=B0=20=D1=83=D1=80=D0=BE=D0=B2=D0=BD?= =?UTF-8?q?=D1=8F=D1=85=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=20=D0=B4=D0=B5=D0=B2=D0=BE=D0=BB=D1=82=D0=BD=D0=BE?= =?UTF-8?q?=D0=B5=20=D0=BE=D1=80=D1=83=D0=B6=D0=B8=D0=B5.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scenes/Level_1.unity | 4 ++-- Assets/Scenes/Level_2.unity | 4 ++-- Assets/Scenes/Lightning/Level_1.meta | 2 +- Assets/Scenes/Lightning/Level_2.meta | 2 +- Assets/Scripts/Weapons/MainWeapon.cs | 18 ++++++++---------- 5 files changed, 14 insertions(+), 16 deletions(-) diff --git a/Assets/Scenes/Level_1.unity b/Assets/Scenes/Level_1.unity index 792faf6b..26443d5c 100644 --- a/Assets/Scenes/Level_1.unity +++ b/Assets/Scenes/Level_1.unity @@ -97,7 +97,8 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} + m_LightingDataAsset: {fileID: 112000000, guid: 7643e9f01761a4a4087efb336a712a80, + type: 2} m_LightingSettings: {fileID: 1579331161} --- !u!196 &4 NavMeshSettings: @@ -4926,7 +4927,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 24318c8c1ca83a54ba0ec54a5fe253e7, type: 3} m_Name: m_EditorClassIdentifier: - _weapon: {fileID: 0} --- !u!1001 &1850245407 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Level_2.unity b/Assets/Scenes/Level_2.unity index 8da1b79a..060db0ff 100644 --- a/Assets/Scenes/Level_2.unity +++ b/Assets/Scenes/Level_2.unity @@ -97,7 +97,8 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} + m_LightingDataAsset: {fileID: 112000000, guid: b72eeead0062ba843a7f4777cf01b56b, + type: 2} m_LightingSettings: {fileID: 1579331161} --- !u!196 &4 NavMeshSettings: @@ -5197,7 +5198,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 24318c8c1ca83a54ba0ec54a5fe253e7, type: 3} m_Name: m_EditorClassIdentifier: - _weapon: {fileID: 0} --- !u!1001 &1850245407 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Lightning/Level_1.meta b/Assets/Scenes/Lightning/Level_1.meta index 126594ad..9a9d344f 100644 --- a/Assets/Scenes/Lightning/Level_1.meta +++ b/Assets/Scenes/Lightning/Level_1.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d1b9a570061437e4eaec841ba21cba7a +guid: eee5806de8823a146ad837132693e163 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scenes/Lightning/Level_2.meta b/Assets/Scenes/Lightning/Level_2.meta index 6200d365..38e1f3fd 100644 --- a/Assets/Scenes/Lightning/Level_2.meta +++ b/Assets/Scenes/Lightning/Level_2.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e303b3771b27f4d419b941039cf18e85 +guid: fecf1ce0419a8a243aab8a04f7d97459 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/Weapons/MainWeapon.cs b/Assets/Scripts/Weapons/MainWeapon.cs index 255cf5d8..9076f855 100644 --- a/Assets/Scripts/Weapons/MainWeapon.cs +++ b/Assets/Scripts/Weapons/MainWeapon.cs @@ -2,14 +2,13 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +[RequireComponent(typeof(PlayerState) )] public class MainWeapon : MonoBehaviour { - [SerializeField] private PlayerAction _weapon; private PlayerState _characterWeapon; private AttackEnergyController _attackEnergiController; private DirectWeapon _directWeapon; - //private StateWeapon _stateWeapon; - + private float _attackResetTime; private float _attackCost; @@ -17,12 +16,14 @@ public class MainWeapon : MonoBehaviour { _attackEnergiController = GetComponent(); - _weapon = StateWeapon._chosenWeapon; _characterWeapon = GetComponent(); - _characterWeapon.defaultAction = _weapon; - + if(StateWeapon._chosenWeapon != null ) + { + _characterWeapon.defaultAction = StateWeapon._chosenWeapon; + } + _attackResetTime = StateWeapon._resetTime; _attackCost = StateWeapon._attackCost; @@ -30,9 +31,6 @@ public class MainWeapon : MonoBehaviour _attackEnergiController.attackResetTime = _attackResetTime; _attackEnergiController.attackCost = _attackCost; - // _attackEnergiController.attackResetTime = 2f; - // _attackEnergiController.attackCost = 0.5f; + } - - }