dushes/Run-and-capture
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '22.10.2021_Zakhar' into develop

Browse Source
This commit is contained in:
DyatelO 2021-10-25 20:50:33 +03:00
commit 6f8147711c
5 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Scenes/Level_1.unity
View File

@ -97,7 +97,8 @@ LightmapSettings:
m_ExportTrainingData: 0 m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4 m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0} m_LightingDataAsset: {fileID: 112000000, guid: 7643e9f01761a4a4087efb336a712a80,
type: 2}
m_LightingSettings: {fileID: 1579331161} m_LightingSettings: {fileID: 1579331161}
--- !u!196 &4 --- !u!196 &4
NavMeshSettings: NavMeshSettings:
@ -4926,7 +4927,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 24318c8c1ca83a54ba0ec54a5fe253e7, type: 3} m_Script: {fileID: 11500000, guid: 24318c8c1ca83a54ba0ec54a5fe253e7, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_weapon: {fileID: 0}
--- !u!1001 &1850245407 --- !u!1001 &1850245407
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

4
Assets/Scenes/Level_2.unity
View File

@ -97,7 +97,8 @@ LightmapSettings:
m_ExportTrainingData: 0 m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4 m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0} m_LightingDataAsset: {fileID: 112000000, guid: b72eeead0062ba843a7f4777cf01b56b,
type: 2}
m_LightingSettings: {fileID: 1579331161} m_LightingSettings: {fileID: 1579331161}
--- !u!196 &4 --- !u!196 &4
NavMeshSettings: NavMeshSettings:
@ -5197,7 +5198,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 24318c8c1ca83a54ba0ec54a5fe253e7, type: 3} m_Script: {fileID: 11500000, guid: 24318c8c1ca83a54ba0ec54a5fe253e7, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_weapon: {fileID: 0}
--- !u!1001 &1850245407 --- !u!1001 &1850245407
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

2
Assets/Scenes/Lightning/Level_1.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: d1b9a570061437e4eaec841ba21cba7a guid: eee5806de8823a146ad837132693e163
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}

2
Assets/Scenes/Lightning/Level_2.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: e303b3771b27f4d419b941039cf18e85 guid: fecf1ce0419a8a243aab8a04f7d97459
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}

18
Assets/Scripts/Weapons/MainWeapon.cs
View File

@ -2,14 +2,13 @@ using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
[RequireComponent(typeof(PlayerState) )]
public class MainWeapon : MonoBehaviour public class MainWeapon : MonoBehaviour
{ {
[SerializeField] private PlayerAction _weapon;
private PlayerState _characterWeapon; private PlayerState _characterWeapon;
private AttackEnergyController _attackEnergiController; private AttackEnergyController _attackEnergiController;
private DirectWeapon _directWeapon; private DirectWeapon _directWeapon;
//private StateWeapon _stateWeapon;
private float _attackResetTime; private float _attackResetTime;
private float _attackCost; private float _attackCost;
@ -17,12 +16,14 @@ public class MainWeapon : MonoBehaviour
{ {
_attackEnergiController = GetComponent<AttackEnergyController>(); _attackEnergiController = GetComponent<AttackEnergyController>();
_weapon = StateWeapon._chosenWeapon;
_characterWeapon = GetComponent<PlayerState>(); _characterWeapon = GetComponent<PlayerState>();
_characterWeapon.defaultAction = _weapon; if(StateWeapon._chosenWeapon != null )
{
_characterWeapon.defaultAction = StateWeapon._chosenWeapon;
}
_attackResetTime = StateWeapon._resetTime; _attackResetTime = StateWeapon._resetTime;
_attackCost = StateWeapon._attackCost; _attackCost = StateWeapon._attackCost;
@ -30,9 +31,6 @@ public class MainWeapon : MonoBehaviour
_attackEnergiController.attackResetTime = _attackResetTime; _attackEnergiController.attackResetTime = _attackResetTime;
_attackEnergiController.attackCost = _attackCost; _attackEnergiController.attackCost = _attackCost;
// _attackEnergiController.attackResetTime = 2f;
// _attackEnergiController.attackCost = 0.5f;
} }
} }