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

Added sound, only perm death, changed Bonus UI, bonus animation, new DeathFVX, modified cap system

Browse Source
This commit is contained in:
AlexMamontow 2021-09-09 14:22:27 +03:00
parent cf86df3ddd
commit 45b9a1e9c6
32 changed files with 2546 additions and 351 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
Assets/Animation/TestBonusController.controller Normal file
View File

@ -0,0 +1,72 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: TestBonusController
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 7920787172528158498}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &7307376670780022128
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: ArmatureBonus
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 38afdf9490c58c5459569b3d82d26085, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &7920787172528158498
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 7307376670780022128}
m_Position: {x: 405.94302, y: 134.12091, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 7307376670780022128}

8
Assets/Animation/TestBonusController.controller.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: cd614b90a6102304781b42552cbacdab
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:

40
Assets/AudioController.cs Normal file
View File

@ -0,0 +1,40 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class AudioController : MonoBehaviour
{
public AudioClip jump_SFX, capture_SFX, hit_SFX;
[SerializeField] private AudioSource ac;/* capSrc, hitSrc, collectSrc;*/
public void PlayJumpSound()
{
ac.volume = 1f;
ac.PlayOneShot(jump_SFX);
}
public void PlayCapSound()
{
ac.volume = 1f;
ac.PlayOneShot(capture_SFX);
}
public void PlayHitSound()
{
ac.volume = 0.5f;
ac.PlayOneShot(hit_SFX);
}
public void PlayCollectSound( AudioClip clip)
{
ac.volume = 1f;
ac.PlayOneShot(clip);
}
public void PlaySound(AudioClip clip)
{
ac.volume = 0.6f;
ac.PlayOneShot(clip);
}
}

11
Assets/AudioController.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 0da3aaf0cfc1fd8439fd1e9803e01cf1
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

18
Assets/GameAudioController.cs Normal file
View File

@ -0,0 +1,18 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class GameAudioController : MonoBehaviour
{
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
}
}

11
Assets/GameAudioController.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 9a5bc924b1df8934188c1eb29c3f2e47
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

3
Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_Att_1 1.prefab
View File

@ -76,6 +76,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
bonus: {fileID: 11400000, guid: 7e835ff05f9d81849b88e10fbd231924, type: 2}
collect_SFX: {fileID: 8300000, guid: 9143d61a72bdc1544b4939ec86f98a8f, type: 3}
aliveTime: 10
--- !u!1001 &4203281804588797499
PrefabInstance:
@ -93,7 +94,7 @@ PrefabInstance:
type: 3}
propertyPath: m_Controller
value:
objectReference: {fileID: 0}
objectReference: {fileID: 9100000, guid: cd614b90a6102304781b42552cbacdab, type: 2}
- target: {fileID: 3196347567083805044, guid: e2feb442e3095ec4aa195eeb2b66fb08,
type: 3}
propertyPath: m_RootOrder

3
Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_Att_1 2.prefab
View File

@ -76,6 +76,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
bonus: {fileID: 11400000, guid: 7e835ff05f9d81849b88e10fbd231924, type: 2}
collect_SFX: {fileID: 8300000, guid: 9143d61a72bdc1544b4939ec86f98a8f, type: 3}
aliveTime: 10
--- !u!1001 &4203281804588797499
PrefabInstance:
@ -93,7 +94,7 @@ PrefabInstance:
type: 3}
propertyPath: m_Controller
value:
objectReference: {fileID: 0}
objectReference: {fileID: 9100000, guid: cd614b90a6102304781b42552cbacdab, type: 2}
- target: {fileID: 3196347567083805044, guid: e2feb442e3095ec4aa195eeb2b66fb08,
type: 3}
propertyPath: m_RootOrder

5
Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_Att_1 3.prefab
View File

@ -13,7 +13,7 @@ GameObject:
- component: {fileID: 388713782}
- component: {fileID: 2451167883024310619}
m_Layer: 0
m_Name: Bonus_Att_1
m_Name: Bonus_Att_1 3
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -76,6 +76,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
bonus: {fileID: 11400000, guid: 7e835ff05f9d81849b88e10fbd231924, type: 2}
collect_SFX: {fileID: 8300000, guid: 9143d61a72bdc1544b4939ec86f98a8f, type: 3}
aliveTime: 10
--- !u!1001 &4203281804588797499
PrefabInstance:
@ -93,7 +94,7 @@ PrefabInstance:
type: 3}
propertyPath: m_Controller
value:
objectReference: {fileID: 0}
objectReference: {fileID: 9100000, guid: cd614b90a6102304781b42552cbacdab, type: 2}
- target: {fileID: 3196347567083805044, guid: e2feb442e3095ec4aa195eeb2b66fb08,
type: 3}
propertyPath: m_RootOrder

3
Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_Att_1.prefab
View File

@ -76,6 +76,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
bonus: {fileID: 11400000, guid: 7e835ff05f9d81849b88e10fbd231924, type: 2}
collect_SFX: {fileID: 8300000, guid: 9143d61a72bdc1544b4939ec86f98a8f, type: 3}
aliveTime: 10
--- !u!1001 &4203281804588797499
PrefabInstance:
@ -93,7 +94,7 @@ PrefabInstance:
type: 3}
propertyPath: m_Controller
value:
objectReference: {fileID: 0}
objectReference: {fileID: 9100000, guid: cd614b90a6102304781b42552cbacdab, type: 2}
- target: {fileID: 3196347567083805044, guid: e2feb442e3095ec4aa195eeb2b66fb08,
type: 3}
propertyPath: m_RootOrder

5
Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_BuildT1 1.prefab
View File

@ -13,7 +13,7 @@ GameObject:
- component: {fileID: 685896563}
- component: {fileID: 7066197434503510216}
m_Layer: 0
m_Name: Bonus_BuildT1
m_Name: Bonus_BuildT1 1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -76,6 +76,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
bonus: {fileID: 11400000, guid: 28c26b456985d4a4cafb8d2c7f61973b, type: 2}
collect_SFX: {fileID: 8300000, guid: 0a34a43bc14857c4b809ad1276de6f14, type: 3}
aliveTime: 10
--- !u!1001 &3542199505056966218
PrefabInstance:
@ -143,7 +144,7 @@ PrefabInstance:
type: 3}
propertyPath: m_Controller
value:
objectReference: {fileID: 0}
objectReference: {fileID: 9100000, guid: cd614b90a6102304781b42552cbacdab, type: 2}
- target: {fileID: 617218703874866897, guid: 2f1a385431c99b64f96b9d73008ac91a,
type: 3}
propertyPath: m_Name

160
Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_BuildT1 2.prefab Normal file
View File

@ -0,0 +1,160 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &8097115959948697207
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8097115959948697204}
- component: {fileID: 685896561}
- component: {fileID: 685896563}
- component: {fileID: 7066197434503510216}
m_Layer: 0
m_Name: Bonus_BuildT1 2
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8097115959948697204
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8097115959948697207}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 3671408027723645473}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!54 &685896561
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8097115959948697207}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 0
m_IsKinematic: 1
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!65 &685896563
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8097115959948697207}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0.73, z: 0}
--- !u!114 &7066197434503510216
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8097115959948697207}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1acd690d26225ec48941ae511fd00f74, type: 3}
m_Name:
m_EditorClassIdentifier:
bonus: {fileID: 11400000, guid: 28c26b456985d4a4cafb8d2c7f61973b, type: 2}
collect_SFX: {fileID: 8300000, guid: 0a34a43bc14857c4b809ad1276de6f14, type: 3}
aliveTime: 10
--- !u!1001 &3542199505056966218
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 8097115959948697204}
m_Modifications:
- target: {fileID: 277848274172404843, guid: 2f1a385431c99b64f96b9d73008ac91a,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 277848274172404843, guid: 2f1a385431c99b64f96b9d73008ac91a,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 277848274172404843, guid: 2f1a385431c99b64f96b9d73008ac91a,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.731
objectReference: {fileID: 0}
- target: {fileID: 277848274172404843, guid: 2f1a385431c99b64f96b9d73008ac91a,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 277848274172404843, guid: 2f1a385431c99b64f96b9d73008ac91a,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 277848274172404843, guid: 2f1a385431c99b64f96b9d73008ac91a,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 277848274172404843, guid: 2f1a385431c99b64f96b9d73008ac91a,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 277848274172404843, guid: 2f1a385431c99b64f96b9d73008ac91a,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 277848274172404843, guid: 2f1a385431c99b64f96b9d73008ac91a,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 277848274172404843, guid: 2f1a385431c99b64f96b9d73008ac91a,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 277848274172404843, guid: 2f1a385431c99b64f96b9d73008ac91a,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 311211224759920785, guid: 2f1a385431c99b64f96b9d73008ac91a,
type: 3}
propertyPath: m_Controller
value:
objectReference: {fileID: 9100000, guid: cd614b90a6102304781b42552cbacdab, type: 2}
- target: {fileID: 617218703874866897, guid: 2f1a385431c99b64f96b9d73008ac91a,
type: 3}
propertyPath: m_Name
value: BonusProtection
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2f1a385431c99b64f96b9d73008ac91a, type: 3}
--- !u!4 &3671408027723645473 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 277848274172404843, guid: 2f1a385431c99b64f96b9d73008ac91a,
type: 3}
m_PrefabInstance: {fileID: 3542199505056966218}
m_PrefabAsset: {fileID: 0}

7
Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_BuildT1 2.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 0a9ba206b196f1c438aed1a349156693
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

3
Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_BuildT1.prefab
View File

@ -76,6 +76,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
bonus: {fileID: 11400000, guid: 28c26b456985d4a4cafb8d2c7f61973b, type: 2}
collect_SFX: {fileID: 8300000, guid: 0a34a43bc14857c4b809ad1276de6f14, type: 3}
aliveTime: 10
--- !u!1001 &3542199505056966218
PrefabInstance:
@ -143,7 +144,7 @@ PrefabInstance:
type: 3}
propertyPath: m_Controller
value:
objectReference: {fileID: 0}
objectReference: {fileID: 9100000, guid: cd614b90a6102304781b42552cbacdab, type: 2}
- target: {fileID: 617218703874866897, guid: 2f1a385431c99b64f96b9d73008ac91a,
type: 3}
propertyPath: m_Name

3
Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_BuildT2.prefab
View File

@ -76,6 +76,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
bonus: {fileID: 11400000, guid: 97e9706d13c45c84982fb30afc5136fd, type: 2}
collect_SFX: {fileID: 8300000, guid: 0a34a43bc14857c4b809ad1276de6f14, type: 3}
aliveTime: 10
--- !u!1001 &3542199505056966218
PrefabInstance:
@ -143,7 +144,7 @@ PrefabInstance:
type: 3}
propertyPath: m_Controller
value:
objectReference: {fileID: 0}
objectReference: {fileID: 9100000, guid: cd614b90a6102304781b42552cbacdab, type: 2}
- target: {fileID: 617218703874866897, guid: 2f1a385431c99b64f96b9d73008ac91a,
type: 3}
propertyPath: m_Name

3
Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_BuildT3 1.prefab
View File

@ -76,6 +76,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
bonus: {fileID: 11400000, guid: da51e27cc47c1e742bfaf861459c8c5e, type: 2}
collect_SFX: {fileID: 8300000, guid: 0a34a43bc14857c4b809ad1276de6f14, type: 3}
aliveTime: 10
--- !u!1001 &3542199505056966218
PrefabInstance:
@ -143,7 +144,7 @@ PrefabInstance:
type: 3}
propertyPath: m_Controller
value:
objectReference: {fileID: 0}
objectReference: {fileID: 9100000, guid: cd614b90a6102304781b42552cbacdab, type: 2}
- target: {fileID: 617218703874866897, guid: 2f1a385431c99b64f96b9d73008ac91a,
type: 3}
propertyPath: m_Name

3
Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_BuildT3.prefab
View File

@ -76,6 +76,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
bonus: {fileID: 11400000, guid: 9e80fbb3ce5dac444b0c6b02b0bf4b3f, type: 2}
collect_SFX: {fileID: 8300000, guid: 0a34a43bc14857c4b809ad1276de6f14, type: 3}
aliveTime: 10
--- !u!1001 &3542199505056966218
PrefabInstance:
@ -143,7 +144,7 @@ PrefabInstance:
type: 3}
propertyPath: m_Controller
value:
objectReference: {fileID: 0}
objectReference: {fileID: 9100000, guid: cd614b90a6102304781b42552cbacdab, type: 2}
- target: {fileID: 617218703874866897, guid: 2f1a385431c99b64f96b9d73008ac91a,
type: 3}
propertyPath: m_Name

2
Assets/Prefabs_NEW/PlayerActions/SuperJump.asset
View File

@ -12,6 +12,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0169a7715dc4850439785448a35ff4a3, type: 3}
m_Name: SuperJump
m_EditorClassIdentifier:
duration: 2.5
duration: 3
distance: 1
actionType: 4

1297
Assets/Prefabs_NEW/UI/NewActionsPanel.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Prefabs_NEW/UI/NewActionsPanel.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 97a03d914d2e6ea40a905290ce13f5b0
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

2
Assets/Prefabs_NEW/VFX/StandartAttackProjectile.prefab
View File

@ -78,6 +78,8 @@ MonoBehaviour:
owner: 0
velocity: 10
damage: 100
throwSFX: {fileID: 8300000, guid: 9ea918c6c23577f4e885a8490d2f2046, type: 3}
ac: {fileID: 0}
--- !u!1001 &8121987183007887425
PrefabInstance:
m_ObjectHideFlags: 0

943
Assets/Scenes/Level_1.unity
View File

File diff suppressed because it is too large Load Diff

4
Assets/Scripts/Actions/Attack.cs
View File

@ -8,6 +8,8 @@ public class Attack : PlayerAction
{
public GameObject standartAttackPref;
public GameObject standartAttackGroundImpact;
public AudioClip throw_SFX;
public override bool IsActionAllowed(TileInfo targetTile, PlayerState playerState)
{
@ -23,6 +25,8 @@ public class Attack : PlayerAction
base.Impact(targetTile, currentPlayer);
Vector3 direction = targetTile.tilePosition - currentPlayer.currentTile.tilePosition;
InitAttack(currentPlayer.currentTile.tilePosition, direction, currentPlayer.ownerIndex);
currentPlayer.GetComponent<AudioController>().PlaySound(throw_SFX);
}
private void InitAttack(Vector3 startPosition, Vector3 direction, TileOwner projOwner)

4
Assets/Scripts/Actions/SuperJump.cs
View File

@ -22,6 +22,10 @@ public class SuperJump : PlayerAction
_capTiles = GetActualCapTargets(GameData.playerLevel, targetTile, playerState);
foreach (var enemy in playerState.enemies)
{
if (!enemy.gameObject.activeSelf)
{
continue;
}
if (_capTiles.Contains(enemy.currentTile))
{
return false;

2
Assets/Scripts/Bonuses/BonusObject.cs
View File

@ -5,6 +5,7 @@ using UnityEngine;
public class BonusObject : MonoBehaviour
{
public Bonus bonus;
public AudioClip collect_SFX;
public float aliveTime = 8f;
@ -36,6 +37,7 @@ public class BonusObject : MonoBehaviour
//Debug.Log("picked up " + gameObject.name);
var tile = TileManagment.GetTile(transform.position);
TileManagment.SetTileAvailable(tile);
playerBonusController.GetComponent<AudioController>().PlayCollectSound(collect_SFX);
Destroy(gameObject);
}
}

15
Assets/Scripts/CaptureController.cs
View File

@ -7,10 +7,10 @@ using UnityEngine;
public class CaptureController : MonoBehaviour
{
public float neutralCaptureTime = 3f, enemyCaptureTime = 5f/*, fastCaptureTime = 0f*/;
public float /*neutralCaptureTime = 3f,*/ enemyCaptureTime = 5f/*, fastCaptureTime = 0f*/;
[SerializeField]
private GameObject capVFX;
[SerializeField] private GameObject capVFX;
[SerializeField] private AudioController _ac;
private PlayerState _playerState;
@ -62,8 +62,10 @@ public class CaptureController : MonoBehaviour
{
if (tile.tileOwnerIndex == TileOwner.Neutral)
{
_currentCoroutine = Capturing(tile, neutralCaptureTime);
StartCoroutine(_currentCoroutine);
/* _currentCoroutine = Capturing(tile, neutralCaptureTime);
StartCoroutine(_currentCoroutine);*/
CaptureTile(tile);
}
else
{
@ -107,7 +109,8 @@ public class CaptureController : MonoBehaviour
if (capVFX != null)
{
Instantiate(capVFX, tile.tilePosition + capVFX.transform.position, capVFX.transform.rotation);
}
}
_ac.PlayCapSound();
}
private IEnumerator Capturing(TileInfo tile, float captureTime)

48
Assets/Scripts/Global/DeathChecker.cs
View File

@ -7,6 +7,9 @@ public class DeathChecker : MonoBehaviour
{
public GameObject deathParticles, resParticles;
public GameObject deathBlue_VFX, deathRed_VFX, deathGreen_VFX, deathYellow_VFX;
public AudioSource deathSrc;
public float resurrectTime = 7f;
@ -16,7 +19,7 @@ public class DeathChecker : MonoBehaviour
private float updateTime = 1f;
private int spawnSafezone = 1;
public static Action<PlayerState> OnPlayerDeath;
public static Action<PlayerState> OnPlayerDeathPermanent;
@ -27,7 +30,7 @@ public class DeathChecker : MonoBehaviour
//TileManagment.OnAnyTileCaptured += CheckPlayersDeath;
}
private void Start()
{
{
SetupLastDeathTimes(GameManager.activePlayers);
@ -41,8 +44,8 @@ public class DeathChecker : MonoBehaviour
List<PlayerState> thisIterationDeadPlayers = new List<PlayerState>();
foreach (var player in agressor.enemies)
{
if (!GameManager.activePlayers.Contains(player)
|| Vector3.Distance(agressor.transform.position, player.transform.position)>1.5f*TileManagment.tileOffset)
if (!GameManager.activePlayers.Contains(player)
|| Vector3.Distance(agressor.transform.position, player.transform.position) > 1.5f * TileManagment.tileOffset)
{
continue;
}
@ -50,7 +53,7 @@ public class DeathChecker : MonoBehaviour
if (player.currentTile.canMove)
{
playerTile = player.targetMoveTile;
}
}
var myAdjacentTiles = TileManagment.GetOwnerAdjacentTiles(playerTile, player.ownerIndex);
int canStandTiles = 0;
foreach (var tile in myAdjacentTiles)
@ -70,7 +73,8 @@ public class DeathChecker : MonoBehaviour
foreach (var player in thisIterationDeadPlayers)
{
MakeDead(player);
//MakeDead(player);
MakeDeadPermanent(player);
}
}
@ -81,7 +85,7 @@ public class DeathChecker : MonoBehaviour
lastDeathTime.Add(0f);
}
}
public void MakeDead(PlayerState player)
{
@ -106,7 +110,7 @@ public class DeathChecker : MonoBehaviour
private void Checker()
{
CheckFinalDeath();
CheckIfNeedRessurection();
//CheckIfNeedRessurection();
}
private void CheckFinalDeath()
@ -153,6 +157,30 @@ public class DeathChecker : MonoBehaviour
PlayerResActions(player);
}
private void SpawnPlayerDeathParticles(PlayerState player)
{
GameObject deathVFX;
switch (player.ownerIndex)
{
case TileOwner.Ariost:
deathVFX = deathRed_VFX;
break;
case TileOwner.Ragnar:
deathVFX = deathBlue_VFX;
break;
case TileOwner.Asvald:
deathVFX = deathYellow_VFX;
break;
case TileOwner.Emir:
deathVFX = deathGreen_VFX;
break;
default:
deathVFX = deathParticles;
break;
}
Instantiate(deathVFX, player.transform.position, deathVFX.transform.rotation);
}
private void PlayerDeadActions(PlayerState player)
{
List<TileInfo> playerTiles = TileManagment.GetCharacterTiles(player);
@ -163,8 +191,10 @@ public class DeathChecker : MonoBehaviour
if (deathParticles)
{
Instantiate(deathParticles, player.transform.position, deathParticles.transform.rotation);
SpawnPlayerDeathParticles(player);
}
deathSrc.Play();
}
private void PlayerResActions(PlayerState player)

3
Assets/Scripts/HealthController.cs
View File

@ -44,6 +44,7 @@ public class HealthController : MonoBehaviour
private void Die()
{
_deathChecker.MakeDead(_playerState);
//_deathChecker.MakeDead(_playerState);
_deathChecker.MakeDeadPermanent(_playerState);
}
}

5
Assets/Scripts/ProjectileController.cs
View File

@ -6,7 +6,7 @@ public class ProjectileController : MonoBehaviour
{
public TileOwner owner = TileOwner.Neutral;
public float velocity = 10f;
public float damage = 100f;
public float damage = 100f;
private Rigidbody _rb;
@ -18,7 +18,7 @@ public class ProjectileController : MonoBehaviour
{
_rb = GetComponent<Rigidbody>();
}
}
private void FixedUpdate()
{
@ -74,6 +74,7 @@ public class ProjectileController : MonoBehaviour
var treeController = other.gameObject.GetComponent<TreeHealthController>();
if (healthController && owner != playerState.ownerIndex)
{
healthController.GetComponent<AudioController>().PlayHitSound();
healthController.TakeDamage(damage);
Destroy(gameObject);
}

3
Assets/Scripts/TileMovement.cs
View File

@ -14,6 +14,8 @@ public class TileMovement : MonoBehaviour
public ParticleSystem moveVFX;
[SerializeField] private AudioController _ac;
private Vector3 _moveDir;
private PlayerState _playerState;
@ -95,6 +97,7 @@ public class TileMovement : MonoBehaviour
_playerState.currentTile.canMove = true;
moveVFX.Play();
_ac.PlayJumpSound();
}
private bool IsMoveCondition()

BIN
Assets/Sprites/BottonPanel.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 52 KiB

204
Assets/Sprites/BottonPanel.png.meta Normal file
View File

@ -0,0 +1,204 @@
fileFormatVersion: 2
guid: 75ea470a0e8e6014a89f572dfe0e0b43
TextureImporter:
internalIDToNameTable:
- first:
213: 2319197029771548660
second: BottonPanel_0
- first:
213: -3177318515211831733
second: BottonPanel_1
- first:
213: 1646022907067540880
second: BottonPanel_2
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: BottonPanel_0
rect:
serializedVersion: 2
x: 26
y: 206
width: 587
height: 667
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 4f79ca339617f2020800000000000000
internalID: 2319197029771548660
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: BottonPanel_1
rect:
serializedVersion: 2
x: 667
y: 206
width: 587
height: 667
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: b46f68205a5e7e3d0800000000000000
internalID: -3177318515211831733
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: BottonPanel_2
rect:
serializedVersion: 2
x: 1307
y: 206
width: 587
height: 667
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 095aaebec19d7d610800000000000000
internalID: 1646022907067540880
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant: