diff --git a/Assets/Animation/TestBonusController.controller b/Assets/Animation/TestBonusController.controller new file mode 100644 index 00000000..37fbc0e2 --- /dev/null +++ b/Assets/Animation/TestBonusController.controller @@ -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} diff --git a/Assets/Animation/TestBonusController.controller.meta b/Assets/Animation/TestBonusController.controller.meta new file mode 100644 index 00000000..ebef7b1f --- /dev/null +++ b/Assets/Animation/TestBonusController.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cd614b90a6102304781b42552cbacdab +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AudioController.cs b/Assets/AudioController.cs new file mode 100644 index 00000000..58ede18c --- /dev/null +++ b/Assets/AudioController.cs @@ -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); + } +} diff --git a/Assets/AudioController.cs.meta b/Assets/AudioController.cs.meta new file mode 100644 index 00000000..e99c6c99 --- /dev/null +++ b/Assets/AudioController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0da3aaf0cfc1fd8439fd1e9803e01cf1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameAudioController.cs b/Assets/GameAudioController.cs new file mode 100644 index 00000000..27b79605 --- /dev/null +++ b/Assets/GameAudioController.cs @@ -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() + { + + } +} diff --git a/Assets/GameAudioController.cs.meta b/Assets/GameAudioController.cs.meta new file mode 100644 index 00000000..43894894 --- /dev/null +++ b/Assets/GameAudioController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9a5bc924b1df8934188c1eb29c3f2e47 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_Att_1 1.prefab b/Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_Att_1 1.prefab index b540065d..96d15f56 100644 --- a/Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_Att_1 1.prefab +++ b/Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_Att_1 1.prefab @@ -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 diff --git a/Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_Att_1 2.prefab b/Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_Att_1 2.prefab index 273a0d7f..e1f1f0ab 100644 --- a/Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_Att_1 2.prefab +++ b/Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_Att_1 2.prefab @@ -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 diff --git a/Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_Att_1 3.prefab b/Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_Att_1 3.prefab index 212f8cbe..50efa1e6 100644 --- a/Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_Att_1 3.prefab +++ b/Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_Att_1 3.prefab @@ -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 diff --git a/Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_Att_1.prefab b/Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_Att_1.prefab index 212f8cbe..3ba8ca4a 100644 --- a/Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_Att_1.prefab +++ b/Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_Att_1.prefab @@ -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 diff --git a/Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_BuildT1 1.prefab b/Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_BuildT1 1.prefab index 423ec431..cffdca36 100644 --- a/Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_BuildT1 1.prefab +++ b/Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_BuildT1 1.prefab @@ -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 diff --git a/Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_BuildT1 2.prefab b/Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_BuildT1 2.prefab new file mode 100644 index 00000000..cab9bb3b --- /dev/null +++ b/Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_BuildT1 2.prefab @@ -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} diff --git a/Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_BuildT1 2.prefab.meta b/Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_BuildT1 2.prefab.meta new file mode 100644 index 00000000..86a6c558 --- /dev/null +++ b/Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_BuildT1 2.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0a9ba206b196f1c438aed1a349156693 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_BuildT1.prefab b/Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_BuildT1.prefab index 423ec431..cc2ecae3 100644 --- a/Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_BuildT1.prefab +++ b/Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_BuildT1.prefab @@ -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 diff --git a/Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_BuildT2.prefab b/Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_BuildT2.prefab index d7e01950..116eec69 100644 --- a/Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_BuildT2.prefab +++ b/Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_BuildT2.prefab @@ -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 diff --git a/Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_BuildT3 1.prefab b/Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_BuildT3 1.prefab index ead690d9..49f2a7c4 100644 --- a/Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_BuildT3 1.prefab +++ b/Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_BuildT3 1.prefab @@ -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 diff --git a/Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_BuildT3.prefab b/Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_BuildT3.prefab index 0f9cc818..ab199504 100644 --- a/Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_BuildT3.prefab +++ b/Assets/Prefabs_NEW/Bonuses/BonusObj/Bonus_BuildT3.prefab @@ -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 diff --git a/Assets/Prefabs_NEW/PlayerActions/SuperJump.asset b/Assets/Prefabs_NEW/PlayerActions/SuperJump.asset index 0d3745fa..f250b8cf 100644 --- a/Assets/Prefabs_NEW/PlayerActions/SuperJump.asset +++ b/Assets/Prefabs_NEW/PlayerActions/SuperJump.asset @@ -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 diff --git a/Assets/Prefabs_NEW/UI/NewActionsPanel.prefab b/Assets/Prefabs_NEW/UI/NewActionsPanel.prefab new file mode 100644 index 00000000..5655cb1f --- /dev/null +++ b/Assets/Prefabs_NEW/UI/NewActionsPanel.prefab @@ -0,0 +1,1297 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &357650607 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 357650608} + - component: {fileID: 357650610} + - component: {fileID: 357650609} + m_Layer: 5 + m_Name: Bonus_1 (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &357650608 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 357650607} + 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: 6821618580259906581} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 500, y: 145} + m_SizeDelta: {x: 250, y: 270} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &357650610 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 357650607} + m_CullTransparentMesh: 1 +--- !u!114 &357650609 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 357650607} + 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: -3177318515211831733, guid: 75ea470a0e8e6014a89f572dfe0e0b43, + 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 &1110084545 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1110084546} + - component: {fileID: 1110084548} + - component: {fileID: 1110084547} + m_Layer: 5 + m_Name: Bonus_1 (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1110084546 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1110084545} + 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: 6821618580259906581} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 180, y: 145} + m_SizeDelta: {x: 250, y: 270} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1110084548 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1110084545} + m_CullTransparentMesh: 1 +--- !u!114 &1110084547 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1110084545} + 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: -3177318515211831733, guid: 75ea470a0e8e6014a89f572dfe0e0b43, + 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 &1735438790 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1735438791} + - component: {fileID: 1735438793} + - component: {fileID: 1735438792} + m_Layer: 5 + m_Name: Bonus_1 (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1735438791 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1735438790} + 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: 6821618580259906581} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -500, y: 145} + m_SizeDelta: {x: 250, y: 270} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1735438793 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1735438790} + m_CullTransparentMesh: 1 +--- !u!114 &1735438792 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1735438790} + 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: 1646022907067540880, guid: 75ea470a0e8e6014a89f572dfe0e0b43, + 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 &1260099305135502050 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8859334620793988638} + - component: {fileID: 7861122245150500907} + - component: {fileID: 4715248551235186102} + m_Layer: 5 + m_Name: Bonus_1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8859334620793988638 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1260099305135502050} + 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: 6821618580259906581} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -180, y: 145} + m_SizeDelta: {x: 250, y: 270} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7861122245150500907 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1260099305135502050} + m_CullTransparentMesh: 1 +--- !u!114 &4715248551235186102 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1260099305135502050} + 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: 1646022907067540880, guid: 75ea470a0e8e6014a89f572dfe0e0b43, + 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 &2844912746090728279 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6821618580259906581} + - component: {fileID: 3734943240667293832} + m_Layer: 5 + m_Name: Images + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6821618580259906581 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2844912746090728279} + 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: 8859334620793988638} + - {fileID: 1735438791} + - {fileID: 1110084546} + - {fileID: 357650608} + m_Father: {fileID: 3858971544782492865} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3734943240667293832 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2844912746090728279} + m_CullTransparentMesh: 1 +--- !u!1 &3858971544697505023 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3858971544697505020} + - component: {fileID: 3858971544697504994} + - component: {fileID: 3858971544697505021} + - component: {fileID: 3858971544697504995} + m_Layer: 5 + m_Name: AttackPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3858971544697505020 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3858971544697505023} + 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: 5665143411414368661} + - {fileID: 1744211102367292428} + m_Father: {fileID: 3858971544782492865} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -392, y: 0} + m_SizeDelta: {x: 784, y: 280} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3858971544697504994 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3858971544697505023} + m_CullTransparentMesh: 1 +--- !u!114 &3858971544697505021 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3858971544697505023} + m_Enabled: 0 + 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: ac81829fc9c9a0647b9c116954242871, 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 &3858971544697504995 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3858971544697505023} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 170 + m_Right: 0 + m_Top: 10 + m_Bottom: 0 + m_ChildAlignment: 0 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 230, y: 250} + m_Spacing: {x: 90, y: 0} + m_Constraint: 0 + m_ConstraintCount: 2 +--- !u!1 &3858971544782492864 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3858971544782492865} + - component: {fileID: 3451699560049539178} + m_Layer: 5 + m_Name: NewActionsPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3858971544782492865 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3858971544782492864} + 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: 6821618580259906581} + - {fileID: 3858971544697505020} + - {fileID: 3858971544809907948} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 120} + m_SizeDelta: {x: 0, y: 240} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &3451699560049539178 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3858971544782492864} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7298695d132038545a05893186580971, type: 3} + m_Name: + m_EditorClassIdentifier: + attackBonusParent: {fileID: 3858971544697505020} + protectBonusParent: {fileID: 3858971544809907948} + bonusController: {fileID: 0} + selectedSlot: {fileID: 0} +--- !u!1 &3858971544809907951 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3858971544809907948} + - component: {fileID: 3858971544809907474} + - component: {fileID: 3858971544809907949} + - component: {fileID: 3858971544809907475} + m_Layer: 5 + m_Name: DefendPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3858971544809907948 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3858971544809907951} + 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: 3212349965240974182} + - {fileID: 3838806789535587985} + m_Father: {fileID: 3858971544782492865} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 392, y: 0} + m_SizeDelta: {x: 784, y: 280} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3858971544809907474 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3858971544809907951} + m_CullTransparentMesh: 1 +--- !u!114 &3858971544809907949 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3858971544809907951} + m_Enabled: 0 + 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: 5f920e20ca19e6e4b9334e0ae143780d, 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 &3858971544809907475 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3858971544809907951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 66 + m_Right: 0 + m_Top: 10 + m_Bottom: 0 + m_ChildAlignment: 0 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 230, y: 250} + m_Spacing: {x: 90, y: 0} + m_Constraint: 0 + m_ConstraintCount: 2 +--- !u!1001 &732207134623218446 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3858971544697505020} + m_Modifications: + - target: {fileID: 4951693946268334740, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_Name + value: BonusSlot + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693947175619844, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693947175619844, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: b53496893be8b3c49917a89d33f9a112, + type: 3} + - target: {fileID: 4951693947175619844, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4951693947175619846, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4951693947175619846, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4951693947175619846, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693947175619846, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693947175619846, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693947175619846, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2988f7085bd1a6844924005e1d763c5b, type: 3} +--- !u!224 &5665143411414368661 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + m_PrefabInstance: {fileID: 732207134623218446} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &6666274854106539671 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3858971544697505020} + m_Modifications: + - target: {fileID: 4951693946268334740, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_Name + value: BonusSlot (1) + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693947175619844, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693947175619844, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: de105660ff3984e83b329b6dd3f484e9, + type: 3} + - target: {fileID: 4951693947175619844, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4951693947175619846, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4951693947175619846, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4951693947175619846, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693947175619846, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693947175619846, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693947175619846, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2988f7085bd1a6844924005e1d763c5b, type: 3} +--- !u!224 &1744211102367292428 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + m_PrefabInstance: {fileID: 6666274854106539671} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7503977943885644285 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3858971544809907948} + m_Modifications: + - target: {fileID: 4951693946268334740, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_Name + value: BonusSlot + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693947175619844, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693947175619844, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: ebc9a94c7b8dc445eb2d8081a53db2b0, + type: 3} + - target: {fileID: 4951693947175619844, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4951693947175619846, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4951693947175619846, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4951693947175619846, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693947175619846, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693947175619846, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693947175619846, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2988f7085bd1a6844924005e1d763c5b, type: 3} +--- !u!224 &3212349965240974182 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + m_PrefabInstance: {fileID: 7503977943885644285} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &8210586617881486346 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3858971544809907948} + m_Modifications: + - target: {fileID: 4951693946268334740, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_Name + value: BonusSlot (1) + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693947175619844, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693947175619844, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: ebc9a94c7b8dc445eb2d8081a53db2b0, + type: 3} + - target: {fileID: 4951693947175619844, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4951693947175619846, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4951693947175619846, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4951693947175619846, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693947175619846, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693947175619846, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693947175619846, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2988f7085bd1a6844924005e1d763c5b, type: 3} +--- !u!224 &3838806789535587985 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4951693946268334747, guid: 2988f7085bd1a6844924005e1d763c5b, + type: 3} + m_PrefabInstance: {fileID: 8210586617881486346} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs_NEW/UI/NewActionsPanel.prefab.meta b/Assets/Prefabs_NEW/UI/NewActionsPanel.prefab.meta new file mode 100644 index 00000000..20a14145 --- /dev/null +++ b/Assets/Prefabs_NEW/UI/NewActionsPanel.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 97a03d914d2e6ea40a905290ce13f5b0 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs_NEW/VFX/StandartAttackProjectile.prefab b/Assets/Prefabs_NEW/VFX/StandartAttackProjectile.prefab index 140b5cb6..ebd795c5 100644 --- a/Assets/Prefabs_NEW/VFX/StandartAttackProjectile.prefab +++ b/Assets/Prefabs_NEW/VFX/StandartAttackProjectile.prefab @@ -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 diff --git a/Assets/Scenes/Level_1.unity b/Assets/Scenes/Level_1.unity index caa2c403..08d991bb 100644 --- a/Assets/Scenes/Level_1.unity +++ b/Assets/Scenes/Level_1.unity @@ -2340,6 +2340,276 @@ MonoBehaviour: hCost: 0 fCost: 0 parent: {fileID: 0} +--- !u!1001 &220439988 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1801607763} + m_Modifications: + - target: {fileID: 1744211102367292428, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1744211102367292428, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1744211102367292428, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1744211102367292428, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1744211102367292428, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1744211102367292428, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1744211103610137491, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3212349965240974182, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3212349965240974182, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3212349965240974182, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3212349965240974182, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3212349965240974182, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3212349965240974182, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3212349966214319353, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3451699560049539178, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: bonusController + value: + objectReference: {fileID: 1801060033} + - target: {fileID: 3838806789535587985, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3838806789535587985, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3838806789535587985, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3838806789535587985, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3838806789535587985, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3838806789535587985, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3838806790443378958, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3858971544782492864, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_Name + value: NewActionsPanel + objectReference: {fileID: 0} + - target: {fileID: 3858971544782492865, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3858971544782492865, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3858971544782492865, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3858971544782492865, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3858971544782492865, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3858971544782492865, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3858971544782492865, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3858971544782492865, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3858971544782492865, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_SizeDelta.y + value: 280 + objectReference: {fileID: 0} + - target: {fileID: 3858971544782492865, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3858971544782492865, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3858971544782492865, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3858971544782492865, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3858971544782492865, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3858971544782492865, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3858971544782492865, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3858971544782492865, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3858971544782492865, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 139.89703 + objectReference: {fileID: 0} + - target: {fileID: 3858971544782492865, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3858971544782492865, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3858971544782492865, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5665143410171049482, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5665143411414368661, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5665143411414368661, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5665143411414368661, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5665143411414368661, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5665143411414368661, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5665143411414368661, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 97a03d914d2e6ea40a905290ce13f5b0, type: 3} +--- !u!224 &220439989 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3858971544782492865, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + m_PrefabInstance: {fileID: 220439988} + m_PrefabAsset: {fileID: 0} --- !u!1001 &220841019 PrefabInstance: m_ObjectHideFlags: 0 @@ -5192,7 +5462,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &436034243 RectTransform: m_ObjectHideFlags: 0 @@ -13974,6 +14244,7 @@ GameObject: - component: {fileID: 1102420994} - component: {fileID: 1102420995} - component: {fileID: 1102420996} + - component: {fileID: 1102420997} m_Layer: 0 m_Name: GameManagment m_TagString: Untagged @@ -14106,6 +14377,7 @@ MonoBehaviour: - {fileID: 4203281806542915686, guid: 099474e8fe45b594788de0f06ebe2d72, type: 3} - {fileID: 4203281806542915686, guid: 536082ec12a94934eb7403bae5a97801, type: 3} - {fileID: 8097115959948697207, guid: 9d4b9d6b2ecc5cc4aba97c4b296568d5, type: 3} + - {fileID: 8097115959948697207, guid: 0a9ba206b196f1c438aed1a349156693, type: 3} - {fileID: 8097115959948697207, guid: 4a38eff5bf7424e45b29d928dfbe9f0b, type: 3} - {fileID: 8097115959948697207, guid: 11705cdd75ae4004d9a3448eb2966a42, type: 3} - {fileID: 8097115959948697207, guid: c708582f481044a42bf9e61a0240a261, type: 3} @@ -14126,6 +14398,15 @@ MonoBehaviour: type: 3} resParticles: {fileID: 4017566179281655563, guid: ea13d84c4b665e04dad27017bf079e19, type: 3} + deathBlue_VFX: {fileID: 4578021055421768374, guid: b2b879dd7ca552a408d4349691d2c8df, + type: 3} + deathRed_VFX: {fileID: 730781534364879866, guid: 15620662117187f419d41032a4267445, + type: 3} + deathGreen_VFX: {fileID: 8483527721606052447, guid: fd7fc481b936cf84a90d2d01d83e9b06, + type: 3} + deathYellow_VFX: {fileID: 7140011676602114744, guid: 6d9f179a27798c248b3c35df9139eb85, + type: 3} + deathSrc: {fileID: 1102420997} resurrectTime: 7 tilesLeftForDeath: 1 --- !u!114 &1102420996 @@ -14144,6 +14425,102 @@ MonoBehaviour: _controllablePlayer: {fileID: 1801060026} _treeAttackBtn: {fileID: 436034242} _treeAttack: {fileID: 11400000, guid: d7c536a3f7526f44085fab5ea8e317cf, type: 2} +--- !u!82 &1102420997 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1102420987} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 158e2b6cd6cdcba49bc9f9c1cb29d84b, type: 3} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1001 &1105100996 PrefabInstance: m_ObjectHideFlags: 0 @@ -17121,316 +17498,6 @@ MonoBehaviour: hCost: 0 fCost: 0 parent: {fileID: 0} ---- !u!1001 &1328941821 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1801607763} - m_Modifications: - - target: {fileID: 426008935055601526, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: bonusController - value: - objectReference: {fileID: 1801060033} - - target: {fileID: 475998300874697850, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 475998300874697850, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 475998300874697850, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 475998300874697850, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 475998300874697850, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 475998300874697850, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1539076252454763922, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1539076252454763922, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1539076252454763922, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1539076252454763922, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1539076252454763922, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1539076252454763922, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2254531856921659789, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2254531856921659789, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2254531856921659789, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2254531856921659789, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2254531856921659789, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2254531856921659789, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2270456895332910044, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_Name - value: ActionsPanel - objectReference: {fileID: 0} - - target: {fileID: 2270456895332910045, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2270456895332910045, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2270456895332910045, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2270456895332910045, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2270456895332910045, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2270456895332910045, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2270456895332910045, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2270456895332910045, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2270456895332910045, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_SizeDelta.y - value: 240 - objectReference: {fileID: 0} - - target: {fileID: 2270456895332910045, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2270456895332910045, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2270456895332910045, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2270456895332910045, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2270456895332910045, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2270456895332910045, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2270456895332910045, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2270456895332910045, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2270456895332910045, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 120 - objectReference: {fileID: 0} - - target: {fileID: 2270456895332910045, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2270456895332910045, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2270456895332910045, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3229810482466864965, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3229810482466864965, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3229810482466864965, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3229810482466864965, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3229810482466864965, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3229810482466864965, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3619544352857738000, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3619544352857738000, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3619544352857738000, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3619544352857738000, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3619544352857738000, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3619544352857738000, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7246638430468298377, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7246638430468298377, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7246638430468298377, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7246638430468298377, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7246638430468298377, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7246638430468298377, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ec3f60c8b043d114ab753f6e5da30a46, type: 3} ---- !u!224 &1328941822 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2270456895332910045, guid: ec3f60c8b043d114ab753f6e5da30a46, - type: 3} - m_PrefabInstance: {fileID: 1328941821} - m_PrefabAsset: {fileID: 0} --- !u!1 &1330179567 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4991598031878838981, guid: fa5ecf8ffbe22c7459c44494cee176d9, @@ -20113,6 +20180,8 @@ GameObject: - component: {fileID: 1503763725} - component: {fileID: 1503763737} - component: {fileID: 1503763727} + - component: {fileID: 1503763738} + - component: {fileID: 1503763741} m_Layer: 0 m_Name: TestRagnar m_TagString: Untagged @@ -20232,9 +20301,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4b3c4882af86905429c1c42aabf068c1, type: 3} m_Name: m_EditorClassIdentifier: - neutralCaptureTime: 1 - enemyCaptureTime: 2 + enemyCaptureTime: 1 capVFX: {fileID: 1651852338557341938, guid: fa6c1fc3da7c8d24c85a88b00cf598d4, type: 3} + _ac: {fileID: 1503763738} --- !u!114 &1503763733 MonoBehaviour: m_ObjectHideFlags: 0 @@ -20250,6 +20319,7 @@ MonoBehaviour: nextTileMoveTime: 0.5 moveDistance: 1 moveVFX: {fileID: 2040783568} + _ac: {fileID: 1503763738} --- !u!114 &1503763734 MonoBehaviour: m_ObjectHideFlags: 0 @@ -20314,7 +20384,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 754e9bf36b6ab0b40a8b71c58aa34b04, type: 3} m_Name: m_EditorClassIdentifier: - isAIActive: 1 + isAIActive: 0 botState: 0 leftInput: {x: 0, y: 0} rightInput: {x: 0, y: 0} @@ -20325,6 +20395,118 @@ MonoBehaviour: detectPlayerDistance: 4 _currentEnemy: {fileID: 0} _currentFollowingPath: [] +--- !u!114 &1503763738 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1503763724} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0da3aaf0cfc1fd8439fd1e9803e01cf1, type: 3} + m_Name: + m_EditorClassIdentifier: + jump_SFX: {fileID: 8300000, guid: db2b24c43cc41514b85fb4a4950c1299, type: 3} + capture_SFX: {fileID: 8300000, guid: 72cf5153f4959df4eb30db3dc01d4e24, type: 3} + hit_SFX: {fileID: 8300000, guid: 6c42231c18643dc4d9d8f8d15bc4735b, type: 3} + ac: {fileID: 1503763741} +--- !u!82 &1503763741 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1503763724} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1001 &1508945981 PrefabInstance: m_ObjectHideFlags: 0 @@ -24472,6 +24654,8 @@ GameObject: - component: {fileID: 1801060025} - component: {fileID: 1801060027} - component: {fileID: 1801060033} + - component: {fileID: 1801060035} + - component: {fileID: 1801060029} m_Layer: 0 m_Name: Player m_TagString: Untagged @@ -24512,6 +24696,7 @@ MonoBehaviour: nextTileMoveTime: 0.5 moveDistance: 1 moveVFX: {fileID: 1307683756} + _ac: {fileID: 1801060035} --- !u!114 &1801060024 MonoBehaviour: m_ObjectHideFlags: 0 @@ -24524,9 +24709,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4b3c4882af86905429c1c42aabf068c1, type: 3} m_Name: m_EditorClassIdentifier: - neutralCaptureTime: 1 - enemyCaptureTime: 2 + enemyCaptureTime: 1 capVFX: {fileID: 442387583353148024, guid: 53959bc898e9a644daad0282881d596a, type: 3} + _ac: {fileID: 1801060035} --- !u!114 &1801060025 MonoBehaviour: m_ObjectHideFlags: 0 @@ -24597,6 +24782,102 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0b1e558538e66434b894cbb9a74b1ff6, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!82 &1801060029 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1801060021} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!114 &1801060030 MonoBehaviour: m_ObjectHideFlags: 0 @@ -24647,7 +24928,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e16f3b4bfc592754783116779d390d0f, type: 3} m_Name: m_EditorClassIdentifier: - maxBonusCount: 3 + maxBonusCount: 2 attackBonuses: [] protectBonuses: [] currentSelectedBonus: {fileID: 0} @@ -24666,6 +24947,22 @@ MonoBehaviour: maxAttackEnergy: 3.1 attackResetTime: 3 attackCost: 1 +--- !u!114 &1801060035 +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: 0da3aaf0cfc1fd8439fd1e9803e01cf1, type: 3} + m_Name: + m_EditorClassIdentifier: + jump_SFX: {fileID: 8300000, guid: db2b24c43cc41514b85fb4a4950c1299, type: 3} + capture_SFX: {fileID: 8300000, guid: 5481b8f08252dd7499af6b48ad6c5354, type: 3} + hit_SFX: {fileID: 8300000, guid: 6c42231c18643dc4d9d8f8d15bc4735b, type: 3} + ac: {fileID: 1801060029} --- !u!1 &1801607759 GameObject: m_ObjectHideFlags: 0 @@ -24757,7 +25054,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - - {fileID: 1328941822} + - {fileID: 220439989} - {fileID: 1036492595} - {fileID: 1467082132} - {fileID: 6614787374390785079} @@ -26697,8 +26994,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1923264931} - m_LocalRotation: {x: 0.029971035, y: -0.000000004076362, z: 0.0000000075761575, - w: 0.9995508} + m_LocalRotation: {x: 0.029971035, y: 0.000000004076362, z: -0.000000007576159, w: 0.9995508} m_LocalPosition: {x: 0, y: 0.87083435, z: -14.50833} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] @@ -27384,7 +27680,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1946816075} - m_LocalRotation: {x: 0.5257311, y: -0.000000007318311, z: 0.000000004522964, w: 0.85065085} + m_LocalRotation: {x: 0.5257311, y: 0.0000000073183117, z: -0.0000000045229647, w: 0.85065085} m_LocalPosition: {x: 0, y: 13, z: -6.5} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -31498,6 +31794,11 @@ PrefabInstance: propertyPath: m_Name value: GoldPanel objectReference: {fileID: 0} + - target: {fileID: 4146064639503085160, guid: 91d45ba5723790642820cfe59d4924fe, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4146064639503085167, guid: 91d45ba5723790642820cfe59d4924fe, type: 3} propertyPath: m_Pivot.x diff --git a/Assets/Scripts/Actions/Attack.cs b/Assets/Scripts/Actions/Attack.cs index 7b54bd03..629f6a01 100644 --- a/Assets/Scripts/Actions/Attack.cs +++ b/Assets/Scripts/Actions/Attack.cs @@ -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().PlaySound(throw_SFX); } private void InitAttack(Vector3 startPosition, Vector3 direction, TileOwner projOwner) diff --git a/Assets/Scripts/Actions/SuperJump.cs b/Assets/Scripts/Actions/SuperJump.cs index 735d39e4..bc1ba656 100644 --- a/Assets/Scripts/Actions/SuperJump.cs +++ b/Assets/Scripts/Actions/SuperJump.cs @@ -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; diff --git a/Assets/Scripts/Bonuses/BonusObject.cs b/Assets/Scripts/Bonuses/BonusObject.cs index 8b14366c..3ab16e43 100644 --- a/Assets/Scripts/Bonuses/BonusObject.cs +++ b/Assets/Scripts/Bonuses/BonusObject.cs @@ -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().PlayCollectSound(collect_SFX); Destroy(gameObject); } } diff --git a/Assets/Scripts/CaptureController.cs b/Assets/Scripts/CaptureController.cs index cad7fb01..c3c0cd57 100644 --- a/Assets/Scripts/CaptureController.cs +++ b/Assets/Scripts/CaptureController.cs @@ -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) diff --git a/Assets/Scripts/Global/DeathChecker.cs b/Assets/Scripts/Global/DeathChecker.cs index ab6811d6..be7f7d3d 100644 --- a/Assets/Scripts/Global/DeathChecker.cs +++ b/Assets/Scripts/Global/DeathChecker.cs @@ -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 OnPlayerDeath; public static Action 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 thisIterationDeadPlayers = new List(); 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 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) diff --git a/Assets/Scripts/HealthController.cs b/Assets/Scripts/HealthController.cs index 4b961490..a065b198 100644 --- a/Assets/Scripts/HealthController.cs +++ b/Assets/Scripts/HealthController.cs @@ -44,6 +44,7 @@ public class HealthController : MonoBehaviour private void Die() { - _deathChecker.MakeDead(_playerState); + //_deathChecker.MakeDead(_playerState); + _deathChecker.MakeDeadPermanent(_playerState); } } diff --git a/Assets/Scripts/ProjectileController.cs b/Assets/Scripts/ProjectileController.cs index bb3663d9..1934e558 100644 --- a/Assets/Scripts/ProjectileController.cs +++ b/Assets/Scripts/ProjectileController.cs @@ -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(); - } + } private void FixedUpdate() { @@ -74,6 +74,7 @@ public class ProjectileController : MonoBehaviour var treeController = other.gameObject.GetComponent(); if (healthController && owner != playerState.ownerIndex) { + healthController.GetComponent().PlayHitSound(); healthController.TakeDamage(damage); Destroy(gameObject); } diff --git a/Assets/Scripts/TileMovement.cs b/Assets/Scripts/TileMovement.cs index 816ff6c0..317a5e99 100644 --- a/Assets/Scripts/TileMovement.cs +++ b/Assets/Scripts/TileMovement.cs @@ -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() diff --git a/Assets/Sprites/BottonPanel.png b/Assets/Sprites/BottonPanel.png new file mode 100644 index 00000000..0d99b605 Binary files /dev/null and b/Assets/Sprites/BottonPanel.png differ diff --git a/Assets/Sprites/BottonPanel.png.meta b/Assets/Sprites/BottonPanel.png.meta new file mode 100644 index 00000000..0d680598 --- /dev/null +++ b/Assets/Sprites/BottonPanel.png.meta @@ -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: