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 22:42:02 +03:00
commit d4200ae24d
4 changed files with 36 additions and 326 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,19 +18,23 @@ public class MainWeapon : MonoBehaviour
_characterWeapon = GetComponent<PlayerState>(); _characterWeapon = GetComponent<PlayerState>();
if(StateWeapon._chosenWeapon != null ) if(StateWeapon._chosenWeapon != null )
{ {
_characterWeapon.defaultAction = StateWeapon._chosenWeapon; _characterWeapon.defaultAction = StateWeapon._chosenWeapon;
_attackResetTime = StateWeapon._resetTime;
_attackCost = StateWeapon._attackCost;
_attackEnergiController.attackResetTime = _attackResetTime;
_attackEnergiController.attackCost = _attackCost;
} }
else
{
_attackResetTime = 3f;
_attackCost = 1f;
_attackEnergiController.attackResetTime = _attackResetTime;
_attackResetTime = StateWeapon._resetTime; _attackEnergiController.attackCost = _attackCost;
_attackCost = StateWeapon._attackCost; }
_attackEnergiController.attackResetTime = _attackResetTime;
_attackEnergiController.attackCost = _attackCost;
} }
} }

206
Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Oswald Bold SDF.asset
View File

File diff suppressed because one or more lines are too long

128
Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
View File

File diff suppressed because one or more lines are too long

4
ProjectSettings/ProjectVersion.txt
View File

@ -1,2 +1,2 @@
m_EditorVersion: 2020.3.10f1 m_EditorVersion: 2020.3.12f1
m_EditorVersionWithRevision: 2020.3.10f1 (297d780c91bc) m_EditorVersionWithRevision: 2020.3.12f1 (b3b2c6512326)