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

Враги атакуют ГГ после его перерождения.

Browse Source
This commit is contained in:
DyatelO 2021-11-26 04:12:10 +03:00
parent c9e84be36b
commit b48beabc1a
3 changed files with 147 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
Assets/Scenes/Level_1.unity
View File

@ -5114,6 +5114,7 @@ MonoBehaviour:
bonusSound: {fileID: 0}
_startGame: {fileID: 8300000, guid: 074f6b4b9b40a344e9af80a6b6346201, type: 3}
_controller: {fileID: 1801060035}
aSourse: {fileID: 1801060029}
--- !u!1001 &1850245407
PrefabInstance:
m_ObjectHideFlags: 0
@ -55621,16 +55622,106 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 1801060021}
- target: {fileID: 3195387929267588557, guid: a72be70db1163c14b8b7a3cb1c00a59d,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3195387929267588557, guid: a72be70db1163c14b8b7a3cb1c00a59d,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3195387929267588557, guid: a72be70db1163c14b8b7a3cb1c00a59d,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3195387929267588557, guid: a72be70db1163c14b8b7a3cb1c00a59d,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3195387929267588557, guid: a72be70db1163c14b8b7a3cb1c00a59d,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3195387929267588557, guid: a72be70db1163c14b8b7a3cb1c00a59d,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5557455103468811314, guid: a72be70db1163c14b8b7a3cb1c00a59d,
type: 3}
propertyPath: bonusController
value:
objectReference: {fileID: 1801060033}
- target: {fileID: 5643681896748709694, guid: a72be70db1163c14b8b7a3cb1c00a59d,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5643681896748709694, guid: a72be70db1163c14b8b7a3cb1c00a59d,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5643681896748709694, guid: a72be70db1163c14b8b7a3cb1c00a59d,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5643681896748709694, guid: a72be70db1163c14b8b7a3cb1c00a59d,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5643681896748709694, guid: a72be70db1163c14b8b7a3cb1c00a59d,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5643681896748709694, guid: a72be70db1163c14b8b7a3cb1c00a59d,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5861359707769992997, guid: a72be70db1163c14b8b7a3cb1c00a59d,
type: 3}
propertyPath: playerHealth
value:
objectReference: {fileID: 1801060027}
- target: {fileID: 6305254850507510473, guid: a72be70db1163c14b8b7a3cb1c00a59d,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6305254850507510473, guid: a72be70db1163c14b8b7a3cb1c00a59d,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6305254850507510473, guid: a72be70db1163c14b8b7a3cb1c00a59d,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6305254850507510473, guid: a72be70db1163c14b8b7a3cb1c00a59d,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6305254850507510473, guid: a72be70db1163c14b8b7a3cb1c00a59d,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6305254850507510473, guid: a72be70db1163c14b8b7a3cb1c00a59d,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7117637457801964014, guid: a72be70db1163c14b8b7a3cb1c00a59d,
type: 3}
propertyPath: _extraLife
@ -55776,6 +55867,36 @@ PrefabInstance:
propertyPath: audioSource
value:
objectReference: {fileID: 1102420997}
- target: {fileID: 8859217424454144084, guid: a72be70db1163c14b8b7a3cb1c00a59d,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8859217424454144084, guid: a72be70db1163c14b8b7a3cb1c00a59d,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8859217424454144084, guid: a72be70db1163c14b8b7a3cb1c00a59d,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8859217424454144084, guid: a72be70db1163c14b8b7a3cb1c00a59d,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8859217424454144084, guid: a72be70db1163c14b8b7a3cb1c00a59d,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8859217424454144084, guid: a72be70db1163c14b8b7a3cb1c00a59d,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3}
--- !u!1 &7121823489171206717

19
Assets/Scripts/Audio/AudioChanger.cs
View File

@ -16,13 +16,21 @@ public class AudioChanger : MonoBehaviour
[SerializeField] private AudioController _controller;
private AudioSource aSourse;
[SerializeField] private AudioSource aSourse;
private float _startVolume;
private void Awake() {
//if(state.defaultAction.name == "LaserAttack")/*
aSourse = GetComponent<AudioSource>();
_startVolume = aSourse.volume ;
if(aSourse != null)
{
//aSourse = GetComponent<AudioSource>();
_startVolume = aSourse.volume ;
}
else
{
aSourse = GetComponent<AudioSource>();
}
if(bonusSound != null)
{
@ -32,7 +40,7 @@ public class AudioChanger : MonoBehaviour
if(_startGame != null)
{
aSourse.volume = _startVolume ;
aSourse.volume = _startVolume ;
aSourse.PlayOneShot(_startGame);
}
@ -64,9 +72,10 @@ public class AudioChanger : MonoBehaviour
}
private void OnTriggerEnter(Collider other) {
aSourse.volume = _startVolume ;
if(other.gameObject.GetComponent<ProjectileController>() != null)
{
aSourse.volume = _startVolume ;
var damage = other.gameObject.GetComponent<ProjectileController>().damage;
switch (damage)
{

13
Assets/Scripts/PlayerState.cs
View File

@ -64,9 +64,20 @@ public class PlayerState : MonoBehaviour
private void Update()
{
AddTowerEnemy();
AddNewEnemies(enemies.Count);
}
private void AddNewEnemies(int amount)
{
if (amount == 0)
{
var newEnemy = GameObject.Find("Player");
if (newEnemy != null)
{
enemies.Add(newEnemy.GetComponent<PlayerState>());
}
}
}
private List<PlayerState> AddTowerEnemy()
{