From c9e84be36bf2a47bc02f5d32c51f6c0521994bd9 Mon Sep 17 00:00:00 2001 From: DyatelO Date: Fri, 26 Nov 2021 01:29:47 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B5=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=D0=B5=D1=82=20=D1=85=D0=B2=D1=83=D0=BA=20=D0=BF=D1=80?= =?UTF-8?q?=D0=BE=D0=B8=D0=B3=D1=80=D1=8B=D1=88=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/Fixed Joystick.prefab | 199 +++++++++++++++++- Assets/Prefabs_NEW/BombPref.prefab | 29 +++ .../PlayerActions/Build_Crystal.asset | 1 + .../Prefabs_NEW/Towers/CrystallTower.prefab | 26 +-- Assets/Prefabs_NEW/UI/GameCanvas.prefab | 42 +++- .../_NewPrefab/CrystalNew/CrystaBlue 1.prefab | 16 +- .../CrystalNew/CrystaGreen 1.prefab | 16 +- .../_NewPrefab/CrystalNew/CrystaRed.prefab | 97 ++++++++- .../_NewPrefab/CrystalNew/CrystaYellow.prefab | 16 +- .../_NewPrefab/CrystalNew/PowerupGlow1.prefab | 2 +- Assets/Scenes/Level_1.unity | 178 +++++----------- Assets/Scenes/Level_2.unity | 122 +---------- Assets/Scripts/Actions/Build.cs | 14 ++ Assets/Scripts/Actions/BuildWithEffect.cs | 16 ++ .../Scripts/Actions/BuildWithEffect.cs.meta | 11 + Assets/Scripts/Audio/ActivateBomusSound.cs | 18 ++ .../Scripts/Audio/ActivateBomusSound.cs.meta | 11 + Assets/Scripts/Audio/AudioChanger.cs | 23 ++ Assets/Scripts/Audio/StartGame.cs | 18 ++ Assets/Scripts/Audio/StartGame.cs.meta | 11 + Assets/Scripts/Audio/VictoryOrNot.cs | 31 +++ Assets/Scripts/Audio/VictoryOrNot.cs.meta | 11 + Assets/Scripts/Bonuses/BonusIsOn.cs | 10 + Assets/Scripts/Bonuses/BonusIsOn.cs.meta | 11 + Assets/Scripts/PlayerState.cs | 17 +- Assets/Scripts/Test/DirectOwner.cs | 33 +-- .../NewSounds/Game Over.mp3.meta | 9 +- 27 files changed, 657 insertions(+), 331 deletions(-) create mode 100644 Assets/Scripts/Actions/BuildWithEffect.cs create mode 100644 Assets/Scripts/Actions/BuildWithEffect.cs.meta create mode 100644 Assets/Scripts/Audio/ActivateBomusSound.cs create mode 100644 Assets/Scripts/Audio/ActivateBomusSound.cs.meta create mode 100644 Assets/Scripts/Audio/StartGame.cs create mode 100644 Assets/Scripts/Audio/StartGame.cs.meta create mode 100644 Assets/Scripts/Audio/VictoryOrNot.cs create mode 100644 Assets/Scripts/Audio/VictoryOrNot.cs.meta create mode 100644 Assets/Scripts/Bonuses/BonusIsOn.cs create mode 100644 Assets/Scripts/Bonuses/BonusIsOn.cs.meta diff --git a/Assets/LoadedAssets/Joystick Pack/Prefabs/Fixed Joystick.prefab b/Assets/LoadedAssets/Joystick Pack/Prefabs/Fixed Joystick.prefab index e69204b1..aeee0b50 100644 --- a/Assets/LoadedAssets/Joystick Pack/Prefabs/Fixed Joystick.prefab +++ b/Assets/LoadedAssets/Joystick Pack/Prefabs/Fixed Joystick.prefab @@ -31,6 +31,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2929252285020697096} + - {fileID: 6647080272829362462} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -56,17 +57,17 @@ MonoBehaviour: m_GameObject: {fileID: 2929252283123773939} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 0, b: 0, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 5b56d9fa0e8bd6e409ed188db38a692c, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -76,6 +77,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!114 &2929252283123773951 MonoBehaviour: m_ObjectHideFlags: 0 @@ -90,8 +92,14 @@ MonoBehaviour: m_EditorClassIdentifier: handleRange: 1 deadZone: 0 + axisOptions: 0 + snapX: 0 + snapY: 0 background: {fileID: 2929252283123773938} handle: {fileID: 2929252285020697096} + backToStartOnTouchUp: 0 + _idleStateOpacity: 1 + _activeStateOpacity: 1 --- !u!1 &2929252285020697097 GameObject: m_ObjectHideFlags: 0 @@ -146,17 +154,17 @@ MonoBehaviour: m_GameObject: {fileID: 2929252285020697097} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 0, b: 0, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 010a6e5305fa7004f89c5d317b7b47d4, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -166,3 +174,178 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4049282189229485802 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7369128546936490929} + - component: {fileID: 8634745640237549255} + - component: {fileID: 8182382501897911947} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7369128546936490929 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4049282189229485802} + 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: [] + m_Father: {fileID: 6647080272829362462} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 128, y: 128} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8634745640237549255 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4049282189229485802} + m_CullTransparentMesh: 0 +--- !u!114 &8182382501897911947 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4049282189229485802} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 010a6e5305fa7004f89c5d317b7b47d4, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5356791883191125138 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6647080272829362462} + - component: {fileID: 2633154071751208634} + - component: {fileID: 8710670036189856508} + - component: {fileID: 6699613767977555298} + m_Layer: 5 + m_Name: Fixed Joystick + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &6647080272829362462 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5356791883191125138} + 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: 7369128546936490929} + m_Father: {fileID: 2929252283123773938} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 128, y: 128} + m_SizeDelta: {x: 256, y: 256} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2633154071751208634 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5356791883191125138} + m_CullTransparentMesh: 0 +--- !u!114 &8710670036189856508 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5356791883191125138} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 5b56d9fa0e8bd6e409ed188db38a692c, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &6699613767977555298 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5356791883191125138} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45977bbae16431c46a013576a1aea384, type: 3} + m_Name: + m_EditorClassIdentifier: + handleRange: 1 + deadZone: 0 + axisOptions: 0 + snapX: 0 + snapY: 0 + background: {fileID: 6647080272829362462} + handle: {fileID: 7369128546936490929} + backToStartOnTouchUp: 0 + _idleStateOpacity: 1 + _activeStateOpacity: 1 diff --git a/Assets/Prefabs_NEW/BombPref.prefab b/Assets/Prefabs_NEW/BombPref.prefab index 5ab3a96a..faf22845 100644 --- a/Assets/Prefabs_NEW/BombPref.prefab +++ b/Assets/Prefabs_NEW/BombPref.prefab @@ -12,6 +12,7 @@ GameObject: - component: {fileID: 8305872390849316397} - component: {fileID: 8305872390849316386} - component: {fileID: 8305872390849316387} + - component: {fileID: 253748612048010415} m_Layer: 0 m_Name: BombPref m_TagString: Untagged @@ -80,6 +81,34 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 +--- !u!114 &253748612048010415 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8305872390849316384} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1a99dc0f9656d2241b5ada4edc0765ee, type: 3} + m_Name: + m_EditorClassIdentifier: + state: {fileID: 8834890311105204208, guid: 935cb93f0fb421b47bac368a21e42353, type: 3} + hit_LightingAudio: {fileID: 8300000, guid: 6c42231c18643dc4d9d8f8d15bc4735b, type: 3} + hit_LaserAudio: {fileID: 8300000, guid: 75cd25f85e881bc458b1dd2f2bd8d84a, type: 3} + hit_TowerFireballAudio: {fileID: 8300000, guid: ab5fd4a38b69eb84f8ca0b8919cedd9c, + type: 3} + hit_SFX: + - {fileID: 8300000, guid: 6c42231c18643dc4d9d8f8d15bc4735b, type: 3} + - {fileID: 8300000, guid: 75cd25f85e881bc458b1dd2f2bd8d84a, type: 3} + - {fileID: 8300000, guid: ab5fd4a38b69eb84f8ca0b8919cedd9c, type: 3} + throw_SFX: + - {fileID: 8300000, guid: 9ea918c6c23577f4e885a8490d2f2046, type: 3} + - {fileID: 8300000, guid: 4af8bb0096e5d15489b02be84b6ce2a4, type: 3} + - {fileID: 8300000, guid: dbba45d74994bff4e8b406722fc8f468, type: 3} + _controller: {fileID: 8834890311105204220, guid: 935cb93f0fb421b47bac368a21e42353, + type: 3} + bonusSound: {fileID: 8300000, guid: e9d3f46b0b5ba9f4cada050219138aac, type: 3} --- !u!1001 &8305872391170760256 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs_NEW/PlayerActions/Build_Crystal.asset b/Assets/Prefabs_NEW/PlayerActions/Build_Crystal.asset index 5ab1d247..d91eaf61 100644 --- a/Assets/Prefabs_NEW/PlayerActions/Build_Crystal.asset +++ b/Assets/Prefabs_NEW/PlayerActions/Build_Crystal.asset @@ -17,3 +17,4 @@ MonoBehaviour: actionType: 2 buildPref: {fileID: 8834890311105204202, guid: 935cb93f0fb421b47bac368a21e42353, type: 3} + prefVFX: {fileID: 5056009352300414474, guid: 06523df870a4ea841951e16293f9195b, type: 3} diff --git a/Assets/Prefabs_NEW/Towers/CrystallTower.prefab b/Assets/Prefabs_NEW/Towers/CrystallTower.prefab index a3f89a93..068c6af9 100644 --- a/Assets/Prefabs_NEW/Towers/CrystallTower.prefab +++ b/Assets/Prefabs_NEW/Towers/CrystallTower.prefab @@ -368,6 +368,7 @@ MonoBehaviour: - {fileID: 8300000, guid: 4af8bb0096e5d15489b02be84b6ce2a4, type: 3} - {fileID: 8300000, guid: dbba45d74994bff4e8b406722fc8f468, type: 3} _controller: {fileID: 8834890311105204220} + bonusSound: {fileID: 8300000, guid: e9d3f46b0b5ba9f4cada050219138aac, type: 3} --- !u!114 &8834890311105204220 MonoBehaviour: m_ObjectHideFlags: 0 @@ -560,11 +561,6 @@ PrefabInstance: propertyPath: m_Name value: CrystaYellow objectReference: {fileID: 0} - - target: {fileID: 1340557858584807726, guid: cd3a6e7cd307230459efab7793f89144, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 1860354886055367572, guid: cd3a6e7cd307230459efab7793f89144, type: 3} propertyPath: m_RootOrder @@ -775,11 +771,6 @@ PrefabInstance: propertyPath: m_Name value: CrystaBlue objectReference: {fileID: 0} - - target: {fileID: 7608523144868387482, guid: 6a709e09a5df18740b3bf6709d4c445b, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6a709e09a5df18740b3bf6709d4c445b, type: 3} --- !u!4 &6848853734429725399 stripped @@ -800,11 +791,6 @@ PrefabInstance: propertyPath: m_Name value: PowerupGlow objectReference: {fileID: 0} - - target: {fileID: 8998066517073135031, guid: a6e69add579ce85468c8a53493ee5f2d, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8998066517073430615, guid: a6e69add579ce85468c8a53493ee5f2d, type: 3} propertyPath: m_RootOrder @@ -925,11 +911,6 @@ PrefabInstance: propertyPath: m_Name value: CrystaRed objectReference: {fileID: 0} - - target: {fileID: 3665624539438581465, guid: ebf1f3df6cc165e45a6d7b7070a8254b, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4149287178398162019, guid: ebf1f3df6cc165e45a6d7b7070a8254b, type: 3} propertyPath: m_RootOrder @@ -1005,11 +986,6 @@ PrefabInstance: propertyPath: m_Name value: CrystaGreen objectReference: {fileID: 0} - - target: {fileID: 5781090781081929243, guid: cf18b2edcc8f55240b200e3dde713ec6, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 6589153021179780257, guid: cf18b2edcc8f55240b200e3dde713ec6, type: 3} propertyPath: m_RootOrder diff --git a/Assets/Prefabs_NEW/UI/GameCanvas.prefab b/Assets/Prefabs_NEW/UI/GameCanvas.prefab index d89c4ff0..0bc5e89c 100644 --- a/Assets/Prefabs_NEW/UI/GameCanvas.prefab +++ b/Assets/Prefabs_NEW/UI/GameCanvas.prefab @@ -412,6 +412,7 @@ GameObject: - component: {fileID: 195587186} - component: {fileID: 195587188} - component: {fileID: 195587187} + - component: {fileID: 7382954402493043111} m_Layer: 5 m_Name: GreyHeart m_TagString: Untagged @@ -478,6 +479,21 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 1 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &7382954402493043111 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 195587185} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8dc4cc07f3bed18489377bd6a954befc, type: 3} + m_Name: + m_EditorClassIdentifier: + victorySound: {fileID: 8300000, guid: c5d6f7a31e8ea824a8e65927b92b86f8, type: 3} + defeatSound: {fileID: 8300000, guid: 8e59fee47fa858a419bdc652dc2a9a71, type: 3} + audioSource: {fileID: 0} --- !u!1 &252584711 GameObject: m_ObjectHideFlags: 0 @@ -2458,6 +2474,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 1 m_CallState: 2 + - m_Target: {fileID: 7382954402493043111} + m_TargetAssemblyTypeName: VictoryOrNot, Assembly-CSharp + m_MethodName: Play + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 --- !u!1 &1645799291 GameObject: m_ObjectHideFlags: 0 @@ -5194,7 +5222,7 @@ PrefabInstance: - target: {fileID: 3858971544782492865, guid: 97a03d914d2e6ea40a905290ce13f5b0, type: 3} propertyPath: m_AnchoredPosition.y - value: -950.0009 + value: 120 objectReference: {fileID: 0} - target: {fileID: 3858971544782492865, guid: 97a03d914d2e6ea40a905290ce13f5b0, type: 3} @@ -5391,12 +5419,6 @@ PrefabInstance: m_RemovedComponents: - {fileID: 8170153791668043265, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} ---- !u!224 &1415495981690910128 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8170153791961219456, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - m_PrefabInstance: {fileID: 7117637457990202416} - m_PrefabAsset: {fileID: 0} --- !u!224 &1415495983658094506 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18, @@ -5409,6 +5431,12 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 7117637457990202416} m_PrefabAsset: {fileID: 0} +--- !u!224 &1415495981690910128 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8170153791961219456, guid: 0d230cc8be529a542a08cb878ab14b18, + type: 3} + m_PrefabInstance: {fileID: 7117637457990202416} + m_PrefabAsset: {fileID: 0} --- !u!1 &1415495982521125429 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8170153791668043269, guid: 0d230cc8be529a542a08cb878ab14b18, diff --git a/Assets/Prefabs_NEW/_NewPrefab/CrystalNew/CrystaBlue 1.prefab b/Assets/Prefabs_NEW/_NewPrefab/CrystalNew/CrystaBlue 1.prefab index 913a9ce1..289d7962 100644 --- a/Assets/Prefabs_NEW/_NewPrefab/CrystalNew/CrystaBlue 1.prefab +++ b/Assets/Prefabs_NEW/_NewPrefab/CrystalNew/CrystaBlue 1.prefab @@ -186,13 +186,14 @@ GameObject: m_Component: - component: {fileID: 7123911558665044000} - component: {fileID: 7302462193445422527} + - component: {fileID: 4878000918464213360} m_Layer: 0 m_Name: CrystaBlue 1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &7123911558665044000 Transform: m_ObjectHideFlags: 0 @@ -231,6 +232,19 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &4878000918464213360 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7608523144868387482} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: daea5dc0944a6f64494462ccf70528f1, type: 3} + m_Name: + m_EditorClassIdentifier: + prefVFX: {fileID: 5056009352300414474, guid: 06523df870a4ea841951e16293f9195b, type: 3} --- !u!1001 &7302462192742828972 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs_NEW/_NewPrefab/CrystalNew/CrystaGreen 1.prefab b/Assets/Prefabs_NEW/_NewPrefab/CrystalNew/CrystaGreen 1.prefab index 494d8194..2df8e06c 100644 --- a/Assets/Prefabs_NEW/_NewPrefab/CrystalNew/CrystaGreen 1.prefab +++ b/Assets/Prefabs_NEW/_NewPrefab/CrystalNew/CrystaGreen 1.prefab @@ -186,13 +186,14 @@ GameObject: m_Component: - component: {fileID: 6589153021179780257} - component: {fileID: 6700202575529220414} + - component: {fileID: 2560119615610951704} m_Layer: 0 m_Name: CrystaGreen 1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &6589153021179780257 Transform: m_ObjectHideFlags: 0 @@ -231,6 +232,19 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &2560119615610951704 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5781090781081929243} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: daea5dc0944a6f64494462ccf70528f1, type: 3} + m_Name: + m_EditorClassIdentifier: + prefVFX: {fileID: 5056009352300414474, guid: 06523df870a4ea841951e16293f9195b, type: 3} --- !u!1001 &2719370941896027787 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs_NEW/_NewPrefab/CrystalNew/CrystaRed.prefab b/Assets/Prefabs_NEW/_NewPrefab/CrystalNew/CrystaRed.prefab index 45e916b2..2d815e7e 100644 --- a/Assets/Prefabs_NEW/_NewPrefab/CrystalNew/CrystaRed.prefab +++ b/Assets/Prefabs_NEW/_NewPrefab/CrystalNew/CrystaRed.prefab @@ -10,13 +10,14 @@ GameObject: m_Component: - component: {fileID: 4149287178398162019} - component: {fileID: 4476441454881675772} + - component: {fileID: 6859176668823321095} m_Layer: 0 m_Name: CrystaRed m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &4149287178398162019 Transform: m_ObjectHideFlags: 0 @@ -33,6 +34,7 @@ Transform: - {fileID: 3900369650144249128} - {fileID: 3900369650083861619} - {fileID: 2313046354239249261} + - {fileID: 7067018841811733584} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -55,6 +57,19 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &6859176668823321095 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3665624539438581465} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: daea5dc0944a6f64494462ccf70528f1, type: 3} + m_Name: + m_EditorClassIdentifier: + prefVFX: {fileID: 5056009352300414474, guid: 06523df870a4ea841951e16293f9195b, type: 3} --- !u!1 &5686134324390134020 GameObject: m_ObjectHideFlags: 0 @@ -231,6 +246,86 @@ Transform: m_Father: {fileID: 4149287178398162019} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &2606838711783771796 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4149287178398162019} + m_Modifications: + - target: {fileID: 5056009352300414474, guid: 06523df870a4ea841951e16293f9195b, + type: 3} + propertyPath: m_Name + value: BonusActivBlue + objectReference: {fileID: 0} + - target: {fileID: 5056009352300414474, guid: 06523df870a4ea841951e16293f9195b, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5061555386607567556, guid: 06523df870a4ea841951e16293f9195b, + type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 5061555386607567556, guid: 06523df870a4ea841951e16293f9195b, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5061555386607567556, guid: 06523df870a4ea841951e16293f9195b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.01 + objectReference: {fileID: 0} + - target: {fileID: 5061555386607567556, guid: 06523df870a4ea841951e16293f9195b, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5061555386607567556, guid: 06523df870a4ea841951e16293f9195b, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 5061555386607567556, guid: 06523df870a4ea841951e16293f9195b, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 5061555386607567556, guid: 06523df870a4ea841951e16293f9195b, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5061555386607567556, guid: 06523df870a4ea841951e16293f9195b, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5061555386607567556, guid: 06523df870a4ea841951e16293f9195b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 5061555386607567556, guid: 06523df870a4ea841951e16293f9195b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5061555386607567556, guid: 06523df870a4ea841951e16293f9195b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 06523df870a4ea841951e16293f9195b, type: 3} +--- !u!4 &7067018841811733584 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5061555386607567556, guid: 06523df870a4ea841951e16293f9195b, + type: 3} + m_PrefabInstance: {fileID: 2606838711783771796} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4476441455523022516 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs_NEW/_NewPrefab/CrystalNew/CrystaYellow.prefab b/Assets/Prefabs_NEW/_NewPrefab/CrystalNew/CrystaYellow.prefab index b2068a7b..5c8e17b0 100644 --- a/Assets/Prefabs_NEW/_NewPrefab/CrystalNew/CrystaYellow.prefab +++ b/Assets/Prefabs_NEW/_NewPrefab/CrystalNew/CrystaYellow.prefab @@ -10,13 +10,14 @@ GameObject: m_Component: - component: {fileID: 1860354886055367572} - component: {fileID: 2187614262282769931} + - component: {fileID: 234377312039590856} m_Layer: 0 m_Name: CrystaYellow m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1860354886055367572 Transform: m_ObjectHideFlags: 0 @@ -55,6 +56,19 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &234377312039590856 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1340557858584807726} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: daea5dc0944a6f64494462ccf70528f1, type: 3} + m_Name: + m_EditorClassIdentifier: + prefVFX: {fileID: 5056009352300414474, guid: 06523df870a4ea841951e16293f9195b, type: 3} --- !u!1 &6140860639475543433 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs_NEW/_NewPrefab/CrystalNew/PowerupGlow1.prefab b/Assets/Prefabs_NEW/_NewPrefab/CrystalNew/PowerupGlow1.prefab index 009db1bd..19f5fc3f 100644 --- a/Assets/Prefabs_NEW/_NewPrefab/CrystalNew/PowerupGlow1.prefab +++ b/Assets/Prefabs_NEW/_NewPrefab/CrystalNew/PowerupGlow1.prefab @@ -4815,7 +4815,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &8998066517073430615 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Level_1.unity b/Assets/Scenes/Level_1.unity index d2001411..c9203460 100644 --- a/Assets/Scenes/Level_1.unity +++ b/Assets/Scenes/Level_1.unity @@ -2797,7 +2797,9 @@ GameObject: - component: {fileID: 1102420994} - component: {fileID: 1102420995} - component: {fileID: 1102420996} + - component: {fileID: 1102421000} - component: {fileID: 1102420997} + - component: {fileID: 1102420999} - component: {fileID: 1102420998} m_Layer: 0 m_Name: GameManagment @@ -2990,7 +2992,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 158e2b6cd6cdcba49bc9f9c1cb29d84b, type: 3} m_PlayOnAwake: 0 - m_Volume: 1 + m_Volume: 0.481 m_Pitch: 1 Loop: 0 Mute: 0 @@ -3091,6 +3093,33 @@ MonoBehaviour: - {fileID: 8834890311105204202, guid: 585c8859be6cfc149ad6ff266df753df, type: 3} - {fileID: 8853505284533567511, guid: fdb87511c2362f4408b49383b0f37ff6, type: 3} - {fileID: 1830563931789208422, guid: cdc012e0347e3ff4c8bcc6e16a2f3bc3, type: 3} +--- !u!114 &1102420999 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1102420987} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6b5dadb9684306343863ce74df4f19db, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1102421000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1102420987} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8dc4cc07f3bed18489377bd6a954befc, type: 3} + m_Name: + m_EditorClassIdentifier: + victorySound: {fileID: 8300000, guid: c5d6f7a31e8ea824a8e65927b92b86f8, type: 3} + defeatSound: {fileID: 8300000, guid: 8e59fee47fa858a419bdc652dc2a9a71, type: 3} + audioSource: {fileID: 1102420997} --- !u!114 &1105100998 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 5359326301570881751, guid: a72be70db1163c14b8b7a3cb1c00a59d, @@ -4698,6 +4727,7 @@ GameObject: - component: {fileID: 1801060039} - component: {fileID: 1801060035} - component: {fileID: 1801060029} + - component: {fileID: 1801060038} m_Layer: 0 m_Name: Player m_TagString: Untagged @@ -4808,7 +4838,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5182c2cb5eef6d849b560f764c4a0ed6, type: 3} m_Name: m_EditorClassIdentifier: - startHealth: 4200 + startHealth: 1 currentHealth: 0 playerImpactVFX: {fileID: 2957420090356197408, guid: 5d1244f7b80cadd428a70173a01ce889, type: 3} @@ -4838,7 +4868,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 0} m_PlayOnAwake: 0 - m_Volume: 1 + m_Volume: 0.3 m_Pitch: 1 Loop: 0 Mute: 0 @@ -4847,7 +4877,7 @@ AudioSource: Priority: 128 DopplerLevel: 1 MinDistance: 1 - MaxDistance: 500 + MaxDistance: 1.01 Pan2D: 0 rolloffMode: 0 BypassEffects: 0 @@ -5041,6 +5071,21 @@ MonoBehaviour: m_EditorClassIdentifier: life: 2 menu: {fileID: 104479278} +--- !u!114 &1801060038 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1801060021} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8dc4cc07f3bed18489377bd6a954befc, type: 3} + m_Name: + m_EditorClassIdentifier: + victorySound: {fileID: 8300000, guid: c5d6f7a31e8ea824a8e65927b92b86f8, type: 3} + defeatSound: {fileID: 8300000, guid: 8e59fee47fa858a419bdc652dc2a9a71, type: 3} + audioSource: {fileID: 1801060029} --- !u!114 &1801060039 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5066,6 +5111,8 @@ MonoBehaviour: - {fileID: 8300000, guid: 9ea918c6c23577f4e885a8490d2f2046, type: 3} - {fileID: 8300000, guid: 4af8bb0096e5d15489b02be84b6ce2a4, type: 3} - {fileID: 8300000, guid: dbba45d74994bff4e8b406722fc8f468, type: 3} + bonusSound: {fileID: 0} + _startGame: {fileID: 8300000, guid: 074f6b4b9b40a344e9af80a6b6346201, type: 3} _controller: {fileID: 1801060035} --- !u!1001 &1850245407 PrefabInstance: @@ -55574,106 +55621,16 @@ 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 @@ -55814,36 +55771,11 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 185995048} - - target: {fileID: 8859217424454144084, guid: a72be70db1163c14b8b7a3cb1c00a59d, + - target: {fileID: 7382954402493043111, 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} + propertyPath: audioSource + value: + objectReference: {fileID: 1102420997} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} --- !u!1 &7121823489171206717 diff --git a/Assets/Scenes/Level_2.unity b/Assets/Scenes/Level_2.unity index eb3582b1..2eaa85d9 100644 --- a/Assets/Scenes/Level_2.unity +++ b/Assets/Scenes/Level_2.unity @@ -3182,101 +3182,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 150272095} m_Modifications: - - 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: 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: 7117637459326710691, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} propertyPath: m_Name @@ -3387,36 +3297,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - 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 &1129072375 stripped @@ -5604,7 +5484,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1923264931} m_LocalRotation: {x: 0.5257311, y: -0.000000007318311, z: 0.000000004522964, w: 0.85065085} - m_LocalPosition: {x: 2.733347, y: 36.76458, z: -55.958107} + m_LocalPosition: {x: 12.99559, y: 36.76458, z: -67.26893} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 231348062} diff --git a/Assets/Scripts/Actions/Build.cs b/Assets/Scripts/Actions/Build.cs index 14f7cae2..99711dc6 100644 --- a/Assets/Scripts/Actions/Build.cs +++ b/Assets/Scripts/Actions/Build.cs @@ -6,6 +6,7 @@ using UnityEngine; public class Build : PlayerAction { public GameObject buildPref; + public GameObject prefVFX; public override bool IsActionAllowed(TileInfo targetTile, PlayerState playerState) { if (!targetTile) @@ -22,8 +23,21 @@ public class Build : PlayerAction targetTile.canMove = false; var spawnedTower = Instantiate(buildPref, targetTile.tilePosition, buildPref.transform.rotation); spawnedTower.GetComponent().owner = currentPlayer.ownerIndex; + //SetEffect(); int activeModelIndex = (int)currentPlayer.ownerIndex - 1; spawnedTower.transform.GetChild(activeModelIndex).gameObject.SetActive(true); TileManagment.AssignBuildingToTile(targetTile, spawnedTower); } + + private void SetEffect() + { + if(prefVFX != null) + { + var effect = Instantiate(prefVFX, buildPref.transform.position, buildPref.transform.rotation); + } + else + { + prefVFX = null; + } + } } diff --git a/Assets/Scripts/Actions/BuildWithEffect.cs b/Assets/Scripts/Actions/BuildWithEffect.cs new file mode 100644 index 00000000..7b47ffe9 --- /dev/null +++ b/Assets/Scripts/Actions/BuildWithEffect.cs @@ -0,0 +1,16 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class BuildWithEffect : MonoBehaviour +{ + public GameObject prefVFX; + void Start() + { + //Instantiate(prefVFX); + } + private void OnEnable() { + + Instantiate(prefVFX, gameObject.GetComponentInParent()); + } +} diff --git a/Assets/Scripts/Actions/BuildWithEffect.cs.meta b/Assets/Scripts/Actions/BuildWithEffect.cs.meta new file mode 100644 index 00000000..ed636cf4 --- /dev/null +++ b/Assets/Scripts/Actions/BuildWithEffect.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: daea5dc0944a6f64494462ccf70528f1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Audio/ActivateBomusSound.cs b/Assets/Scripts/Audio/ActivateBomusSound.cs new file mode 100644 index 00000000..2f941ed7 --- /dev/null +++ b/Assets/Scripts/Audio/ActivateBomusSound.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ActivateBomusSound : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/Scripts/Audio/ActivateBomusSound.cs.meta b/Assets/Scripts/Audio/ActivateBomusSound.cs.meta new file mode 100644 index 00000000..52129da6 --- /dev/null +++ b/Assets/Scripts/Audio/ActivateBomusSound.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 171f1ef875b9c484ab1ce5f635a34931 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Audio/AudioChanger.cs b/Assets/Scripts/Audio/AudioChanger.cs index 557a926c..8bc36601 100644 --- a/Assets/Scripts/Audio/AudioChanger.cs +++ b/Assets/Scripts/Audio/AudioChanger.cs @@ -11,14 +11,36 @@ public class AudioChanger : MonoBehaviour [SerializeField] private AudioClip[] throw_SFX; private AudioClip hit_Audio, throw_Audio; + [SerializeField] private AudioClip bonusSound; + [SerializeField] private AudioClip _startGame; + [SerializeField] private AudioController _controller; + private AudioSource aSourse; + private float _startVolume; + private void Awake() { //if(state.defaultAction.name == "LaserAttack")/* + aSourse = GetComponent(); + _startVolume = aSourse.volume ; + + if(bonusSound != null) + { + aSourse.volume = _startVolume ; + aSourse.PlayOneShot(bonusSound); + } + + if(_startGame != null) + { + aSourse.volume = _startVolume ; + aSourse.PlayOneShot(_startGame); + } + hit_Audio = _controller.hit_SFX; throw_Audio = _controller.throw_SFX; + switch (state.defaultAction.name ) { case "LaserAttack": @@ -44,6 +66,7 @@ public class AudioChanger : MonoBehaviour private void OnTriggerEnter(Collider other) { if(other.gameObject.GetComponent() != null) { + aSourse.volume = _startVolume ; var damage = other.gameObject.GetComponent().damage; switch (damage) { diff --git a/Assets/Scripts/Audio/StartGame.cs b/Assets/Scripts/Audio/StartGame.cs new file mode 100644 index 00000000..33208ba9 --- /dev/null +++ b/Assets/Scripts/Audio/StartGame.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class StartGame : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/Scripts/Audio/StartGame.cs.meta b/Assets/Scripts/Audio/StartGame.cs.meta new file mode 100644 index 00000000..a80f1d57 --- /dev/null +++ b/Assets/Scripts/Audio/StartGame.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6b5dadb9684306343863ce74df4f19db +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Audio/VictoryOrNot.cs b/Assets/Scripts/Audio/VictoryOrNot.cs new file mode 100644 index 00000000..4282ca27 --- /dev/null +++ b/Assets/Scripts/Audio/VictoryOrNot.cs @@ -0,0 +1,31 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class VictoryOrNot : MonoBehaviour +{ + //[SerializeField] private GameObject greyHeart; + //[SerializeField] private Extralife extralife; + private string zero = "0"; + [SerializeField] private AudioClip victorySound; + [SerializeField] private AudioClip defeatSound; + [SerializeField] private AudioSource audioSource; + private float volume; + + private void Awake() { + volume = audioSource.volume; + } + + + public void Play() + { + + + audioSource.volume = 0.5f * volume ; + //audioSource.clip = defeatSound; + //audioSource.PlayOneShot(audioSource.clip); + audioSource.PlayOneShot(defeatSound); + + } +} diff --git a/Assets/Scripts/Audio/VictoryOrNot.cs.meta b/Assets/Scripts/Audio/VictoryOrNot.cs.meta new file mode 100644 index 00000000..779ad61d --- /dev/null +++ b/Assets/Scripts/Audio/VictoryOrNot.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8dc4cc07f3bed18489377bd6a954befc +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Bonuses/BonusIsOn.cs b/Assets/Scripts/Bonuses/BonusIsOn.cs new file mode 100644 index 00000000..c7966cc5 --- /dev/null +++ b/Assets/Scripts/Bonuses/BonusIsOn.cs @@ -0,0 +1,10 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class BonusIsOn : MonoBehaviour +{ + public GameObject prefVFX; + + +} diff --git a/Assets/Scripts/Bonuses/BonusIsOn.cs.meta b/Assets/Scripts/Bonuses/BonusIsOn.cs.meta new file mode 100644 index 00000000..dba0e0b2 --- /dev/null +++ b/Assets/Scripts/Bonuses/BonusIsOn.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1dd09ade3ea539e4baedd2cba8cabdb1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/PlayerState.cs b/Assets/Scripts/PlayerState.cs index 1baebd6e..f088a67f 100644 --- a/Assets/Scripts/PlayerState.cs +++ b/Assets/Scripts/PlayerState.cs @@ -91,6 +91,10 @@ public class PlayerState : MonoBehaviour //enemies.Add(player); enemies.Add(FindObjectOfType().GetComponent()); } + else if(GetComponent() && enemies.Count == 0) + { + enemies.Add(gameObject.GetComponent().GetComponent()); + } } return enemies; } @@ -147,22 +151,11 @@ public class PlayerState : MonoBehaviour { prevState = currentState; currentState = newState; - /*if (newState == CharacterState.Action) - { - currentSubState = currentAction.actionType; - }*/ + OnCharStateChanged?.Invoke(newState); } } - /*public void SetNewCharSubState(ActionType newActionType) - { - if (currentSubState != newActionType) - { - currentSubState = newActionType; - OnSubStateChanged?.Invoke(newActionType); - } - }*/ public void SetCurrentAction(PlayerAction newAction) { diff --git a/Assets/Scripts/Test/DirectOwner.cs b/Assets/Scripts/Test/DirectOwner.cs index 35613cee..162d0279 100644 --- a/Assets/Scripts/Test/DirectOwner.cs +++ b/Assets/Scripts/Test/DirectOwner.cs @@ -8,48 +8,23 @@ public class DirectOwner : MonoBehaviour public int count = 1; private CaptureController _crystallColor; - [SerializeField] private ToweHealthController _parrantOwner; //= new ToweHealthController(); + [SerializeField] private ToweHealthController _parrantOwner; [SerializeField] - private PlayerState _reseptOwver; // = new PlayerState(); + private PlayerState _reseptOwver; + - //public static TileInfo info = new TileInfo(); private void Start() { _parrantOwner.owner = GetComponent().owner; _reseptOwver.ownerIndex = _parrantOwner.owner; - //_reseptOwver.ownerIndex = _aiPrefab.GetComponent().ownerIndex; - //_parrantOwner = _aiPrefab.GetComponent(); - //_crystallColor = _aiPrefab.GetComponent(); - //_parrantOwner.owner = _reseptOwver.ownerIndex; + } private void Update() { _reseptOwver.ownerIndex = _parrantOwner.owner; - //_crystallColor = new CaptureController(); - //info.tileOwnerIndex = _parrantOwner.owner; - //_parrantOwner.owner = _reseptOwver.ownerIndex; - //_reseptOwver.ownerIndex = _parrantOwner.owner; } } -/* - [SerializeField] private ToweHealthController _parrantOwner; //= new ToweHealthController(); - [SerializeField] private PlayerState _reseptOwver; //= new PlayerState(); - - //public static TileInfo info = new TileInfo(); - - - private void Awake() - { - _parrantOwner = GetComponent(); - } - - private void FixedUpdate() - { - //info.tileOwnerIndex = _parrantOwner.owner; - _reseptOwver.ownerIndex = _parrantOwner.owner; - } - */ \ No newline at end of file diff --git a/Assets/Sound Pack 01.09/NewSounds/Game Over.mp3.meta b/Assets/Sound Pack 01.09/NewSounds/Game Over.mp3.meta index d359e891..afb68324 100644 --- a/Assets/Sound Pack 01.09/NewSounds/Game Over.mp3.meta +++ b/Assets/Sound Pack 01.09/NewSounds/Game Over.mp3.meta @@ -10,7 +10,14 @@ AudioImporter: compressionFormat: 1 quality: 1 conversionMode: 0 - platformSettingOverrides: {} + platformSettingOverrides: + 7: + loadType: 0 + sampleRateSetting: 1 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 forceToMono: 0 normalize: 1 preloadAudioData: 1