diff --git a/ShowPT/Assets/BossEvent.cs b/ShowPT/Assets/BossEvent.cs new file mode 100644 index 00000000..b46222b0 --- /dev/null +++ b/ShowPT/Assets/BossEvent.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class BossEvent : GenericEvent +{ + public List tvs; + private TVShowmanManager tVShowmanManager; + + private void Start() + { + tVShowmanManager = GameObject.FindGameObjectWithTag("TVShowmanManager").GetComponent(); + } + + public override void onEnableEvent() + { + tVShowmanManager.playMessageAllTVs(tvs, type); + } +} diff --git a/ShowPT/Assets/Scripts/TurretEvent.cs.meta b/ShowPT/Assets/BossEvent.cs.meta similarity index 77% rename from ShowPT/Assets/Scripts/TurretEvent.cs.meta rename to ShowPT/Assets/BossEvent.cs.meta index a3a5eeb0..60bf566a 100644 --- a/ShowPT/Assets/Scripts/TurretEvent.cs.meta +++ b/ShowPT/Assets/BossEvent.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 79adfdb35448f8a47a144d4a4b65bec9 -timeCreated: 1535802942 +guid: 6cbd873355790e24794bab208fe2ddbe +timeCreated: 1538003185 licenseType: Free MonoImporter: externalObjects: {} diff --git a/ShowPT/Assets/MidTimeEvent.cs b/ShowPT/Assets/MidTimeEvent.cs new file mode 100644 index 00000000..b9b4d3f4 --- /dev/null +++ b/ShowPT/Assets/MidTimeEvent.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class MidTimeEvent : GenericEvent +{ + public List tvs; + private TVShowmanManager tVShowmanManager; + + private void Start() + { + tVShowmanManager = GameObject.FindGameObjectWithTag("TVShowmanManager").GetComponent(); + } + + public override void onEnableEvent() + { + tVShowmanManager.playMessageAllTVs(tvs, type); + } +} diff --git a/ShowPT/Assets/MidTimeEvent.cs.meta b/ShowPT/Assets/MidTimeEvent.cs.meta new file mode 100644 index 00000000..3bdc3da9 --- /dev/null +++ b/ShowPT/Assets/MidTimeEvent.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: d68a1bb71d61f9742974c9453617b82e +timeCreated: 1538002635 +licenseType: Free +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ShowPT/Assets/Scenes/Game.unity b/ShowPT/Assets/Scenes/Game.unity index d3430e59..86fc63ff 100644 --- a/ShowPT/Assets/Scenes/Game.unity +++ b/ShowPT/Assets/Scenes/Game.unity @@ -36171,6 +36171,60 @@ RectTransform: m_AnchoredPosition: {x: -83.90005, y: -85.3202} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &244758803 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 244758804} + - component: {fileID: 244758806} + - component: {fileID: 244758805} + m_Layer: 10 + m_Name: BossTrigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &244758804 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 244758803} + m_LocalRotation: {x: 0, y: -0.65275973, z: 0, w: 0.757565} + m_LocalPosition: {x: -1.24, y: -4.77, z: 162.85} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 918409136} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: -81.5, z: 0} +--- !u!65 &244758805 +BoxCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 244758803} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 19.623274, y: 6.871087, z: 1} + m_Center: {x: -3.8201, y: -2.9355435, z: 0.00000667434} +--- !u!114 &244758806 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 244758803} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3b15e07c006151644bf5890c327765c2, type: 3} + m_Name: + m_EditorClassIdentifier: + eventsType: 06000000 --- !u!1 &245117717 GameObject: m_ObjectHideFlags: 0 @@ -73425,7 +73479,7 @@ ParticleSystem: moveWithTransform: 0 moveWithCustomTransform: {fileID: 0} scalingMode: 1 - randomSeed: 1408643780 + randomSeed: 1162781838 InitialModule: serializedVersion: 3 enabled: 1 @@ -96188,9 +96242,10 @@ GameObject: serializedVersion: 5 m_Component: - component: {fileID: 588722492} - - component: {fileID: 588722491} - component: {fileID: 588722490} - component: {fileID: 588722493} + - component: {fileID: 588722494} + - component: {fileID: 588722495} m_Layer: 0 m_Name: EventsContainer m_TagString: EventsContainer @@ -96212,18 +96267,6 @@ MonoBehaviour: type: 0 tvs: - Flying TV ---- !u!114 &588722491 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 588722489} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 79adfdb35448f8a47a144d4a4b65bec9, type: 3} - m_Name: - m_EditorClassIdentifier: - type: 1 --- !u!4 &588722492 Transform: m_ObjectHideFlags: 0 @@ -96253,6 +96296,34 @@ MonoBehaviour: - Flying TV (4) - Flying TV (1) ctrlShieldDrones: {fileID: 2102756863} +--- !u!114 &588722494 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 588722489} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d68a1bb71d61f9742974c9453617b82e, type: 3} + m_Name: + m_EditorClassIdentifier: + type: 3 + tvs: + - Flying TV (3) +--- !u!114 &588722495 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 588722489} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6cbd873355790e24794bab208fe2ddbe, type: 3} + m_Name: + m_EditorClassIdentifier: + type: 6 + tvs: + - Flying TV (5) --- !u!1 &588837366 GameObject: m_ObjectHideFlags: 0 @@ -126034,7 +126105,7 @@ Mesh: m_KeepVertices: 1 m_KeepIndices: 1 m_IndexFormat: 0 - m_IndexBuffer: 00000100020001000000030000000400050000000500030001000300060002000700080009000a0004000900040000000000080009000a0009000b000b00090008000b0008000c000d000e000f000d00100011000d0011000e0001001200110001001100100013000100100010000d001400130010001400150016001700030005001700030017001600060003001600180006001600180016001500150016001500190006001800060019001a0006001a001b001b001a001c001b001c001c001b001c001d0006001b00010001001b001d001d00120012001d00120001001d001c001c001d001c0012001c001c001c001c001c001c00130002000100020013001e0002001e001f0002001f000700200021002200220021002300220023002400250021002000260021002500260025002700280029002a002b002c0029002b00290028002c002b002d0028002e002f003000210031003200210030003200300033003400320033003400330035003400350036003400360037003400370038002b00380037002b00370039002b0039003a002d002b003a003200230021002100260031003b003c003d003e003f00400041003f003e0041003e004200430044004000430040003f0044004300450044004500460047004100420048004100470049004a0049004b004c004a004b004a0049004b0049004d004e004f004b004e004b004d004c004b0050004f004e0051004f00510052004f00520053004f00530054004f00540055004f00550056004f005600570058005300520058005200590058005a005b005a0058000c000c00580058000c0058005c005800580058005800580059005900580059005d005e005f005d00570056005d0056005e003f00600043005d0043006000600057005d0057006000610060006200610060003f0062004b00610062004b00620063006200640063003f00640062003f004100640063006400650063006500660067006300660067006600680067004b006300690041003b0069003b006a003b00410048003b0048006b003c003b006b003c006b006c003b003d006a00670068006d0067006d005000670050004b006e005d006f0043005d006e0043006e0045006f005d005f0061004f00570061004b004f00 + m_IndexBuffer: 000001000200030004000500060004000300060003000700080009000500080005000400090008000a0009000a000b000c00060007000d0006000c000e000f000e00100011000f0010000f000e0010000e001200130014001000130010001200110010001500140013001600140016001700140017001800140018001900140019001a0014001a001b0014001b001c001d00180017001d0017001e001d001f0020001f001d00210021001d001d0021001d0022001d001d001d001d001d001e001e001d001e0023002400250023001c001b0023001b00240004002600080023000800260026001c0023001c002600270026002800270026000400280010002700280010002800290028002a00290004002a002800040006002a0029002a002b0029002b002c002d0029002c002d002c002e002d00100029002f00060000002f0000003000000006000d0000000d0031000100000031000100310032000000020030002d002e0033002d00330015002d0015001000340023003500080023003400080034000a00350023002500270014001c00270010001400360037003800380037003900380039003a003b00370036003c0037003b003c003b003d003e003f004000410042003f0041003f003e004200410043003e00440045004600370047004800370046004800460049004a00480049004a0049004b004a004b004c004a004c004d004a004d004e0041004e004d0041004d004f0041004f00500043004100500048003900370037003c0047005100520053005200510054005100550056005100560054005200540057005300580059005a005b0055005a0055005100510059005a005b005a005c005c005a0059005c00590021005d005e005f005d00600061005d0061005e0052006200610052006100600063005200600060005d006400630060006400650066006700540056006700540067006600570054006600680057006600680066006500650066006500690057006800570069006a0057006a006b006b006a006c006b006c006c006b006c006d0057006b00520052006b006d006d00620062006d00620052006d006c006c006d006c0062006c006c006c006c006c006c00630053005200530063006e0053006e006f0053006f005800 m_Skin: [] m_VertexData: m_CurrentChannels: 27 @@ -126073,7 +126144,7 @@ Mesh: format: 0 dimension: 0 m_DataSize: 4480 - _typelessdata: b9ecb73e12f1e6be4d629fbe75d6313fa6074f3e02b930bfebb1733f9eed463febb1733f9eed463f1b5c833eaf11ddbe0aeb9abedf495fbefbe26b3f53a6a4beac216e3f269d473fac216e3f269d473f1ff9a63eea25dcbe8e9874beebce4c3e56016a3fc19eb4be1e05723f55b8473f1e05723f55b8473fae0ca23e0cdee6beba8ab9be522edf3e0da72a3f58cb1abfc74e713f4bac463fc74e713f4bac463f42eeae3e58b0ffbeff60aebe640e4e3f8bec783da21c17bfa995723f6544443fa995723f6544443f5090a53ea492ffbed44ebabe798a573fffdeaa3d4e7608bf7579713f6544443f7579713f6544443f99638b3e8478e6be6289bdbe4a6f69be9552513f965407bff6116f3f9ca1463ff6116f3f9ca1463f8f10b93e3927e7be59f67ebe68c3e33e0d68593f179f91bedcf9733fac89463fdcf9733fac89463f3e0fc13e30f3efbe199d96be536f7a3f0cd80bbe26ce1fbe6696743f5a1f463f6696743f5a1f463f7a9dbb3e0e26febec7489bbec0f1693fb222adbecc3366be4cfe733ffda9443f4cfe733ffda9443fd776b83e05bc00bf8483a0befef2623f18e492beb2dbb9bec0a4733f6544443fc0a4733f6544443f7d3dba3ea23501bf6d0f8dbebc4b613f44e6f1bef14443bd8dda733f6544443f8dda733f6544443f82ebb73eddd7febe0b2e87be2e3dcd3e7b5b673ebd4963bf84de733f6544443f84de733f6544443fa49a0a3e5b9af1be0c4444bee182e3bedade603f802c34be9a0e673f1e5d453f9a0e673f1e5d453f44aefb3dbcd5fbbefed272be29c70abf5d41503fe2a457beb25f663f6544443fb25f663f6544443fbf7beb3d631efcbea2b756bece9421bfc010423f881928bed6f4653f6544443fd6f4653f6544443fcab0343ebf34edbecd2770befdfaf4be028f5e3f3bf5fcbd9a85693f1ddb453f9a85693f1ddb453f0a42113ef7a6fbbeeee989be490af9bec263593ffd9d52bef277673f6544443ff277673f6544443f1a651f3ece3afcbe4d199dbee6bdcabed7833c3f676f0cbf623c683f6544443f623c683f6544443f5e396f3eed3cdbbe13db6fbe672008be6af07a3fca0f16be59b76c3f89c8473f59b76c3f89c8473fb1b7463e9607e5be680d2fbe49f0e0be6379643f9f90d1bdb18b6a3f9dbf463fb18b6a3f9dbf463fa01e943ea0fefdbe6b6ecebee89d5a3da889c83e5e266bbfc3ea6f3f6544443fc3ea6f3f6544443f724a993e36a1f4be0f2acabe3e014bbc698df63e515760bf8f8e703fe840453f8f8e703fe840453fa882a03ef4cfffbefa6bc4bea3105a3fb925163d41c605bfade1703f6544443fade1703f6544443fb425873e815bfdbe69d7cbbee37124bdbb20043fc7065bbf38776e3f6544443f38776e3f6544443f5721683e76c0fcbeaa9ecdbec989b5bdf768223fb59444bf1f476c3f6544443f1f476c3f6544443f3460553eaa39fcbe9fdfc8be328af1beb5bc3c3fbb9ef7be966a6b3f6544443f966a6b3f6544443f6032653e776beebea311bbbe91b00bbf3421503fe60750be17616c3fe0c0453f17616c3fe0c0453f483b413e6db6fbbe1869b3bef85ac2becc5e563fbd5fc9be05316a3f6544443f05316a3f6544443f7917603e244dedbeaa5c9ebedd7cf3be6130493f3d5ccabe810a6c3f87e4453f810a6c3f87e4453f98bd973e3dc5d6be76dc40bef661b63c19877b3f89333dbe2f5b703fe346483f2f5b703fe346483f2d83b43e2cdadabe2e4c60bec0873e3e7791693fe7afbabee299733f53dd473fe299733f53dd473f9597fd3e8eb0923dc121eebef7c9f0bedc31473ff130d5be217b7c3fb53e643f217b7c3fb53e643f21cae53eac6c8e3db20dd5be7ca207bf930b4f3fa8b682be55c0793f051c643f55c0793f051c643f5d7cfd3e507ac63d70abd4be996bfbbe3860563f89cb75be217b7c3f3ca5653f217b7c3f3ca5653f3f9dec3e7c00b93db84e80befba317bf8fd34d3f4ca554bdcf947a3f8d4a653fcf947a3f8d4a653f2868fd3e23f6d63d06dc9fbe1fa801bf57155c3f30df87bd217b7c3fdb16663f217b7c3fdb16663fb109fe3ed5bb753da63cf9beef36c4be9140583fd144bfbe217b7c3f268c633f217b7c3f268c633f8a89f83e01de473d3fed00bfb605c1be07405a3f2059b9be99d67b3f70e8623f99d67b3f70e8623f1c36fe3e184d5a3d46e800bf22ddb2be8c0c5e3f6e76b5be217b7c3f9f27633f217b7c3f9f27633f261b633e62dbd3be4189cabecf367ebfb82ca7bd5b44aebd1e866c3f0134493f1e866c3f0134493ffb0a6c3e4dd4d4be713600bfbd1c7fbfc68b9b3b9e21aabd8a0b6d3fe50b493f8a0b6d3fe50b493fabe16b3e358af1be693600bf7f1d7fbf4179373b5407aabd24096d3f08de453f24096d3f08de453f97a6633e0ce181bee4f3c2be478c65bf3fe3d83e1bad03be8c7f6c3f4aff513f8c7f6c3f4aff513f44546c3efe08b9be131d00bfe58a7fbf5ef523bd8db835bd0d106d3f8d264c3f0d106d3f8d264c3f71b1653e61f38ebede2d00bfbb8677bfb1427b3eda548fbd9ca86c3f7fa6503f9ca86c3f7fa6503f13897a3e496d00bf5f07f9be43717bbf52c12abe3e27b1bddae06d3f6544443fdae06d3f6544443fd189693e496d00bf888798be43717bbf52c12abe3e27b1bd1de46c3f6544443f1de46c3f6544443faf29d63ee34ea83c536a00bfc42730bfad0d353f682126beb607783f6063613fb607783f6063613f4a31ee3ecec01f3dd7f100bf6bd5bdbe1e2e5a3fa5efbcbe02a27a3f495a623f02a27a3f495a623f0f38cf3e34e01d3d80627abe4eb133bfff96353f33de83bd503b773f6268623f503b773f6268623f7c88cf3eae43933b543e00bfb55134bf0c14343f83c7c2bd0745773fe27a603f0745773fe27a603fe4ed8f3e15ddc2bd371dc2be009158bf5b76003f62b638be15f76f3f79f15a3f15f76f3f79f15a3f98adc03ed716b9bcc86300bff3c036bfcbfa2e3f69e81bbeb58c753f7df45e3fb58c753f7df45e3f18fa9a3ee884e0bd188700bfbd435bbf3846f23eed1553be3b41713f65235a3f3b41713f65235a3f5dea973eebef02be677700bf001b6bbf48d8b33e3f903abe9cef703f472c593f9cef703f472c593ffa067c3e48552bbe944da5bebc986cbf1b35aa3e637940be34ee6d3f42f2563f34ee6d3f42f2563fc3ce913e7bf220be066800bf725368bfcd17c73e7f8922be5138703f537d573f5138703f537d573fde1c783e1aa080beef5700bf2e0a5ebfcb64f53eea6409be57ab6d3fc21a523f57ab6d3fc21a523f24b279be7a75a73e1144e13e1b6ac73da749503ed76779bf512e503fd80e733f512e503fd80e733fbfe2b4be9105003fd08ac63ec5f8de3ea5320b3c677066bf5578493f21fb7c3f5578493f21fb7c3fd79549be6590ff3e764cda3ef04e063d8b61aebda1ee7ebf8703533f21fb7c3f8703533f21fb7c3f5f8300bf7c5cb2bd049d6f3dd0434dbed4c60f3f6a804dbfd400413fc75d5b3fd400413fc75d5b3f2ca99dbe68bae1bc926b563db1fdf4be85cdc93e5bdf48bf2eb64c3f7ad65e3f2eb64c3f7ad65e3fee4300bf01ad3abe2d77603d5947d4bdb834d73d32327dbfd400413fbb39563fd400413fbb39563fb206adbe5761ce3d8f2b4b3e8207e03cf5c2233f0ba544bf36a04a3ff6f9653f36a04a3ff6f9653fc31f00bffcd9a4bc6951043ea08346bdba380b3f897956bfd400413fa32c5f3fd400413fa32c5f3fe072adbeb42febbe389772ba4afa11bff4e8073fce7b20bfa2ee4a3f8745463fa2ee4a3f8745463f157300bf9d84c5beb578e03cf9d033bea882d83c66ee7bbfd400413fedba4a3fd400413fedba4a3fe63dbebec09cfebecb24023ca3090bbffcc48a3e30724bbf19f7483f6544443f19f7483f6544443f889200bfdb3400bf2e84173d2ef564beaa2da5bdc0a978bfd400413f6544443fd400413f6544443f1047ffbec215e93d4f0c353ebd7b103edc2b683ef1b376bfd400413f3cf3663fd400413f3cf3663fe3dcfdbe5fcc7a3e2eb8463e48b7d53ea03ae13e868e4bbfd400413fd3436e3fd400413fd3436e3f58d3003f474afd3e3c27ca3db21ca53ef7cd533e92776cbf217b7c3f41907c3f217b7c3f41907c3ffc55fd3e8e87003fba80c73db21ca53ef7cd533e92776cbfccfa7b3f21fb7c3fccfa7b3f21fb7c3f96cd3b3e0246b83ee3e42b3ccf2bb7bebb32013ff62249bffadc693feabf743ffadc693feabf743f7deccc3ea588013f4df09d3d387625be9660193fd7bf48bfc9a4763f21fb7c3fc9a4763f21fb7c3f359e003f47e79a3ee2cda13d1d33773e8b0f1d3e534e75bf217b7c3f13b2713f217b7c3f13b2713f9166003f381af63dacb21e3d3742203e44bbbc3e78936abf217b7c3feb3a673f217b7c3feb3a673f928fb43e5c78373deff188bcfd3ccabc96c3703e39be78bf6abb733ff507633f6abb733ff507633fa72f963e620f023fc6e38e3ebc610ebf5f024e3ff88c54be0885703f21fb7c3f0885703f21fb7c3f322a003fdbf5363dce78debbc4da833d0b519e3e4ce572bf217b7c3f64fb623f217b7c3f64fb623f85cefc3edd7fa6beaddb09bddca91fbf51152f3f46ccc1be217b7c3f0ecb4d3f217b7c3f0ecb4d3fb4edd13e3400d3bef4d54dbda7c1bcbe7e24183faefa36bf2659773f26ea483f2659773f26ea483f5344983ef865ffbe194ed8bda177ab3e45acf03d77556fbf3b3b703f6544443f3b3b703f6544443f4b461e3e7927ffbe746620be6235653ecc29293eeae475bf5acd673f6544443f5acd673f6544443f78b4983dc20bffbe3a9529be1fcea6bb95d03e3e42837bbf122e633f6544443f122e633f6544443ff943983cf4d687be17c4f4bd1d36bfbe1ebd0c3fc3473fbfdb11603ff443513fdb11603ff443513f8837fc3e6a8bacbef9ba51be136af43dea92d03e5cca67bf74f87b3fc9474d3f74f87b3fc9474d3ff673ff3ef656a7be88ad4bbe76cfdabd843f113f0f0651bf217b7c3f27c44d3f217b7c3f27c44d3f4ea3963e9f69fcbe824371be5727f8bedd5e333fa50a06bf9487703f6544443f9487703f6544443fec958b3e2616fcbee8c442be2fd014bf94ac433f2ddc8ebe9c4d6f3f6544443f9c4d6f3f6544443f6b76003fe9f2febe486473be8d07393e9739523e6b3d76bf217b7c3f6544443f217b7c3f6544443f2b9388bea30ef3be050f13be926b34bf8e75903c768f35bfb54b4f3fdab0453fb54b4f3fdab0453f4f8d4ebe9cabffbe89461dbed232bebd49dc833d335c7ebfcfcc523f6544443fcfcc523f6544443f222282befe7600bfd0dc14beff63edbec3ec39beaf015ebf8fe64f3f6544443f8fe64f3f6544443fec928ebd7dcb66be526c313d485fa2beea64813d063f72bf45ca5a3f46ce533f45ca5a3f46ce533f0e23ae3de144ccbd4be1e5bccffd1ebe3721673eb03476bf47e4633fe2d65a3f47e4633fe2d65a3f32aef1bde00cbb3d994b3d3c0d01c4be49bdf33e33ae4abf71f3573fb088653f71f3573fb088653f66671d3e0f64ba3e6c75143e8f9ebabe087a5a3f47c2bebefc19683f52c9743ffc19683f52c9743fa9e3e5bd4775b43e772c283eabe390be0f49303fb6e92abfe83b583f0439743fe83b583f0439743fc7490e3da21a023f6d90bd3e2ce79ebd2667523fc47810bfbbda603f21fb7c3fbbda603f21fb7c3f763d703d0835023fa59bbc3e98a5553e24b75c3f2a5fecbe451b623f21fb7c3f451b623f21fb7c3f4e5b533e0279f33ed50ed33e610bb1bea3af403fd56d0fbf62396b3f9d2a7b3f62396b3f9d2a7b3fc836c63d094a013f8ca3c83e57c7873e8deb003fce7d52bf4457643f21fb7c3f4457643f21fb7c3f8053f83c87cd013fbae7c33e539f0abfe648343ff717ebbefddd603f21fb7c3ffddd603f21fb7c3f1a44c03c97fd003ff6f4c63e4763d1be401ec63e4c9253bf9c61603f21fb7c3f9c61603f21fb7c3ffcfefcbe87159a3e9063743ebd32163f5373813eccf144bfd400413f678c713fd400413f678c713feee5fcbe4b65003fd3938e3e81171b3fc6441e3ed6ca47bfd400413f21fb7c3fd400413f21fb7c3f93a17e3e2a5f013f3934d53e45ee92be512c093f71474bbfe5b36d3f21fb7c3fe5b36d3f21fb7c3fded299be5f7dfebebaf6f0bd816534bfbb06973e113325bfbb4a4d3f6544443fbb4a4d3f6544443faf908abe122101bfd68700bed2edf7bec6d5e1be3f7041bff0ee4e3f6544443ff0ee4e3f6544443f + _typelessdata: 24b279be7a75a73e1144e13e1b6ac73da749503ed76779bf512e503fd80e733f512e503fd80e733fbfe2b4be9105003fd08ac63ec5f8de3ea5320b3c677066bf5578493f21fb7c3f5578493f21fb7c3fd79549be6590ff3e764cda3ef04e063d8b61aebda1ee7ebf8703533f21fb7c3f8703533f21fb7c3f5f8300bf7c5cb2bd049d6f3dd0434dbed4c60f3f6a804dbfd400413fc75d5b3fd400413fc75d5b3f2ca99dbe68bae1bc926b563db1fdf4be85cdc93e5bdf48bf2eb64c3f7ad65e3f2eb64c3f7ad65e3fee4300bf01ad3abe2d77603d5947d4bdb834d73d32327dbfd400413fbb39563fd400413fbb39563fb206adbe5761ce3d8f2b4b3e8207e03cf5c2233f0ba544bf36a04a3ff6f9653f36a04a3ff6f9653fc31f00bffcd9a4bc6951043ea08346bdba380b3f897956bfd400413fa32c5f3fd400413fa32c5f3fe072adbeb42febbe389772ba4afa11bff4e8073fce7b20bfa2ee4a3f8745463fa2ee4a3f8745463f157300bf9d84c5beb578e03cf9d033bea882d83c66ee7bbfd400413fedba4a3fd400413fedba4a3fe63dbebec09cfebecb24023ca3090bbffcc48a3e30724bbf19f7483f6544443f19f7483f6544443f889200bfdb3400bf2e84173d2ef564beaa2da5bdc0a978bfd400413f6544443fd400413f6544443f1047ffbec215e93d4f0c353ebd7b103edc2b683ef1b376bfd400413f3cf3663fd400413f3cf3663fe3dcfdbe5fcc7a3e2eb8463e48b7d53ea03ae13e868e4bbfd400413fd3436e3fd400413fd3436e3f58d3003f474afd3e3c27ca3db21ca53ef7cd533e92776cbf217b7c3f41907c3f217b7c3f41907c3ffc55fd3e8e87003fba80c73db21ca53ef7cd533e92776cbfccfa7b3f21fb7c3fccfa7b3f21fb7c3f96cd3b3e0246b83ee3e42b3ccf2bb7bebb32013ff62249bffadc693feabf743ffadc693feabf743f7deccc3ea588013f4df09d3d387625be9660193fd7bf48bfc9a4763f21fb7c3fc9a4763f21fb7c3f359e003f47e79a3ee2cda13d1d33773e8b0f1d3e534e75bf217b7c3f13b2713f217b7c3f13b2713f9166003f381af63dacb21e3d3742203e44bbbc3e78936abf217b7c3feb3a673f217b7c3feb3a673f928fb43e5c78373deff188bcfd3ccabc96c3703e39be78bf6abb733ff507633f6abb733ff507633fa72f963e620f023fc6e38e3ebc610ebf5f024e3ff88c54be0885703f21fb7c3f0885703f21fb7c3f322a003fdbf5363dce78debbc4da833d0b519e3e4ce572bf217b7c3f64fb623f217b7c3f64fb623f85cefc3edd7fa6beaddb09bddca91fbf51152f3f46ccc1be217b7c3f0ecb4d3f217b7c3f0ecb4d3fb4edd13e3400d3bef4d54dbda7c1bcbe7e24183faefa36bf2659773f26ea483f2659773f26ea483f5344983ef865ffbe194ed8bda177ab3e45acf03d77556fbf3b3b703f6544443f3b3b703f6544443f4b461e3e7927ffbe746620be6235653ecc29293eeae475bf5acd673f6544443f5acd673f6544443f78b4983dc20bffbe3a9529be1fcea6bb95d03e3e42837bbf122e633f6544443f122e633f6544443ff943983cf4d687be17c4f4bd1d36bfbe1ebd0c3fc3473fbfdb11603ff443513fdb11603ff443513f8837fc3e6a8bacbef9ba51be136af43dea92d03e5cca67bf74f87b3fc9474d3f74f87b3fc9474d3ff673ff3ef656a7be88ad4bbe76cfdabd843f113f0f0651bf217b7c3f27c44d3f217b7c3f27c44d3f4ea3963e9f69fcbe824371be5727f8bedd5e333fa50a06bf9487703f6544443f9487703f6544443fec958b3e2616fcbee8c442be2fd014bf94ac433f2ddc8ebe9c4d6f3f6544443f9c4d6f3f6544443f50a1b73e72bdffbe4ec786be6e2c2d3fdbfc4f3d1b173cbfeeab733f6544443feeab733f6544443f6b76003fe9f2febe486473be8d07393e9739523e6b3d76bf217b7c3f6544443f217b7c3f6544443f2b9388bea30ef3be050f13be926b34bf8e75903c768f35bfb54b4f3fdab0453fb54b4f3fdab0453f4f8d4ebe9cabffbe89461dbed232bebd49dc833d335c7ebfcfcc523f6544443fcfcc523f6544443f222282befe7600bfd0dc14beff63edbec3ec39beaf015ebf8fe64f3f6544443f8fe64f3f6544443fec928ebd7dcb66be526c313d485fa2beea64813d063f72bf45ca5a3f46ce533f45ca5a3f46ce533f0e23ae3de144ccbd4be1e5bccffd1ebe3721673eb03476bf47e4633fe2d65a3f47e4633fe2d65a3f32aef1bde00cbb3d994b3d3c0d01c4be49bdf33e33ae4abf71f3573fb088653f71f3573fb088653f66671d3e0f64ba3e6c75143e8f9ebabe087a5a3f47c2bebefc19683f52c9743ffc19683f52c9743fa9e3e5bd4775b43e772c283eabe390be0f49303fb6e92abfe83b583f0439743fe83b583f0439743fc7490e3da21a023f6d90bd3e2ce79ebd2667523fc47810bfbbda603f21fb7c3fbbda603f21fb7c3f763d703d0835023fa59bbc3e98a5553e24b75c3f2a5fecbe451b623f21fb7c3f451b623f21fb7c3f4e5b533e0279f33ed50ed33e610bb1bea3af403fd56d0fbf62396b3f9d2a7b3f62396b3f9d2a7b3fc836c63d094a013f8ca3c83e57c7873e8deb003fce7d52bf4457643f21fb7c3f4457643f21fb7c3f8053f83c87cd013fbae7c33e539f0abfe648343ff717ebbefddd603f21fb7c3ffddd603f21fb7c3f1a44c03c97fd003ff6f4c63e4763d1be401ec63e4c9253bf9c61603f21fb7c3f9c61603f21fb7c3ffcfefcbe87159a3e9063743ebd32163f5373813eccf144bfd400413f678c713fd400413f678c713feee5fcbe4b65003fd3938e3e81171b3fc6441e3ed6ca47bfd400413f21fb7c3fd400413f21fb7c3f93a17e3e2a5f013f3934d53e45ee92be512c093f71474bbfe5b36d3f21fb7c3fe5b36d3f21fb7c3fded299be5f7dfebebaf6f0bd816534bfbb06973e113325bfbb4a4d3f6544443fbb4a4d3f6544443faf908abe122101bfd68700bed2edf7bec6d5e1be3f7041bff0ee4e3f6544443ff0ee4e3f6544443f9597fd3e8eb0923dc121eebef7c9f0bedc31473ff130d5be217b7c3fb53e643f217b7c3fb53e643f21cae53eac6c8e3db20dd5be7ca207bf930b4f3fa8b682be55c0793f051c643f55c0793f051c643f5d7cfd3e507ac63d70abd4be996bfbbe3860563f89cb75be217b7c3f3ca5653f217b7c3f3ca5653f3f9dec3e7c00b93db84e80befba317bf8fd34d3f4ca554bdcf947a3f8d4a653fcf947a3f8d4a653f2868fd3e23f6d63d06dc9fbe1fa801bf57155c3f30df87bd217b7c3fdb16663f217b7c3fdb16663fb109fe3ed5bb753da63cf9beef36c4be9140583fd144bfbe217b7c3f268c633f217b7c3f268c633f8a89f83e01de473d3fed00bfb605c1be07405a3f2059b9be99d67b3f70e8623f99d67b3f70e8623f1c36fe3e184d5a3d46e800bf22ddb2be8c0c5e3f6e76b5be217b7c3f9f27633f217b7c3f9f27633f261b633e62dbd3be4189cabecf367ebfb82ca7bd5b44aebd1e866c3f0134493f1e866c3f0134493ffb0a6c3e4dd4d4be713600bfbd1c7fbfc68b9b3b9e21aabd8a0b6d3fe50b493f8a0b6d3fe50b493fabe16b3e358af1be693600bf7f1d7fbf4179373b5407aabd24096d3f08de453f24096d3f08de453f97a6633e0ce181bee4f3c2be478c65bf3fe3d83e1bad03be8c7f6c3f4aff513f8c7f6c3f4aff513f44546c3efe08b9be131d00bfe58a7fbf5ef523bd8db835bd0d106d3f8d264c3f0d106d3f8d264c3f71b1653e61f38ebede2d00bfbb8677bfb1427b3eda548fbd9ca86c3f7fa6503f9ca86c3f7fa6503f13897a3e496d00bf5f07f9be43717bbf52c12abe3e27b1bddae06d3f6544443fdae06d3f6544443fd189693e496d00bf888798be43717bbf52c12abe3e27b1bd1de46c3f6544443f1de46c3f6544443faf29d63ee34ea83c536a00bfc42730bfad0d353f682126beb607783f6063613fb607783f6063613f4a31ee3ecec01f3dd7f100bf6bd5bdbe1e2e5a3fa5efbcbe02a27a3f495a623f02a27a3f495a623f0f38cf3e34e01d3d80627abe4eb133bfff96353f33de83bd503b773f6268623f503b773f6268623f7c88cf3eae43933b543e00bfb55134bf0c14343f83c7c2bd0745773fe27a603f0745773fe27a603fe4ed8f3e15ddc2bd371dc2be009158bf5b76003f62b638be15f76f3f79f15a3f15f76f3f79f15a3f98adc03ed716b9bcc86300bff3c036bfcbfa2e3f69e81bbeb58c753f7df45e3fb58c753f7df45e3f18fa9a3ee884e0bd188700bfbd435bbf3846f23eed1553be3b41713f65235a3f3b41713f65235a3f5dea973eebef02be677700bf001b6bbf48d8b33e3f903abe9cef703f472c593f9cef703f472c593ffa067c3e48552bbe944da5bebc986cbf1b35aa3e637940be34ee6d3f42f2563f34ee6d3f42f2563fc3ce913e7bf220be066800bf725368bfcd17c73e7f8922be5138703f537d573f5138703f537d573fde1c783e1aa080beef5700bf2e0a5ebfcb64f53eea6409be57ab6d3fc21a523f57ab6d3fc21a523fb9ecb73e12f1e6be4d629fbe75d6313fa6074f3e02b930bfebb1733f9eed463febb1733f9eed463f1b5c833eaf11ddbe0aeb9abedf495fbefbe26b3f53a6a4beac216e3f269d473fac216e3f269d473f1ff9a63eea25dcbe8e9874beebce4c3e56016a3fc19eb4be1e05723f55b8473f1e05723f55b8473fae0ca23e0cdee6beba8ab9be522edf3e0da72a3f58cb1abfc74e713f4bac463fc74e713f4bac463f42eeae3e58b0ffbeff60aebe640e4e3f8bec783da21c17bfa995723f6544443fa995723f6544443f5090a53ea492ffbed44ebabe798a573fffdeaa3d4e7608bf7579713f6544443f7579713f6544443f99638b3e8478e6be6289bdbe4a6f69be9552513f965407bff6116f3f9ca1463ff6116f3f9ca1463f8f10b93e3927e7be59f67ebe68c3e33e0d68593f179f91bedcf9733fac89463fdcf9733fac89463f3e0fc13e30f3efbe199d96be536f7a3f0cd80bbe26ce1fbe6696743f5a1f463f6696743f5a1f463f7a9dbb3e0e26febec7489bbec0f1693fb222adbecc3366be4cfe733ffda9443f4cfe733ffda9443fd776b83e05bc00bf8483a0befef2623f18e492beb2dbb9bec0a4733f6544443fc0a4733f6544443f7d3dba3ea23501bf6d0f8dbebc4b613f44e6f1bef14443bd8dda733f6544443f8dda733f6544443fa49a0a3e5b9af1be0c4444bee182e3bedade603f802c34be9a0e673f1e5d453f9a0e673f1e5d453f44aefb3dbcd5fbbefed272be29c70abf5d41503fe2a457beb25f663f6544443fb25f663f6544443fbf7beb3d631efcbea2b756bece9421bfc010423f881928bed6f4653f6544443fd6f4653f6544443fcab0343ebf34edbecd2770befdfaf4be028f5e3f3bf5fcbd9a85693f1ddb453f9a85693f1ddb453f0a42113ef7a6fbbeeee989be490af9bec263593ffd9d52bef277673f6544443ff277673f6544443f1a651f3ece3afcbe4d199dbee6bdcabed7833c3f676f0cbf623c683f6544443f623c683f6544443f5e396f3eed3cdbbe13db6fbe672008be6af07a3fca0f16be59b76c3f89c8473f59b76c3f89c8473fb1b7463e9607e5be680d2fbe49f0e0be6379643f9f90d1bdb18b6a3f9dbf463fb18b6a3f9dbf463fa01e943ea0fefdbe6b6ecebee89d5a3da889c83e5e266bbfc3ea6f3f6544443fc3ea6f3f6544443f724a993e36a1f4be0f2acabe3e014bbc698df63e515760bf8f8e703fe840453f8f8e703fe840453fa882a03ef4cfffbefa6bc4bea3105a3fb925163d41c605bfade1703f6544443fade1703f6544443fb425873e815bfdbe69d7cbbee37124bdbb20043fc7065bbf38776e3f6544443f38776e3f6544443f5721683e76c0fcbeaa9ecdbec989b5bdf768223fb59444bf1f476c3f6544443f1f476c3f6544443f3460553eaa39fcbe9fdfc8be328af1beb5bc3c3fbb9ef7be966a6b3f6544443f966a6b3f6544443f6032653e776beebea311bbbe91b00bbf3421503fe60750be17616c3fe0c0453f17616c3fe0c0453f483b413e6db6fbbe1869b3bef85ac2becc5e563fbd5fc9be05316a3f6544443f05316a3f6544443f7917603e244dedbeaa5c9ebedd7cf3be6130493f3d5ccabe810a6c3f87e4453f810a6c3f87e4453f98bd973e3dc5d6be76dc40bef661b63c19877b3f89333dbe2f5b703fe346483f2f5b703fe346483f2d83b43e2cdadabe2e4c60bec0873e3e7791693fe7afbabee299733f53dd473fe299733f53dd473f m_CompressedMesh: m_Vertices: m_NumItems: 0 @@ -152614,6 +152685,12 @@ Prefab: propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 114868171400063452, guid: a15fb44ccb84f844482787c7eb7c7d1d, + type: 2} + propertyPath: tvCollection + value: + objectReference: {fileID: 11400000, guid: 2fc658a5b791f8745a1575e8b2af4963, + type: 2} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: a15fb44ccb84f844482787c7eb7c7d1d, type: 2} m_IsPrefabParent: 0 @@ -159355,6 +159432,8 @@ Transform: - {fileID: 1499718517} - {fileID: 1531932547} - {fileID: 1502707025} + - {fileID: 1140946064} + - {fileID: 244758804} m_Father: {fileID: 0} m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -201684,6 +201763,60 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1140020971} m_Mesh: {fileID: 4300000, guid: fcec5347a5479e64e8be000772271a47, type: 3} +--- !u!1 &1140946063 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1140946064} + - component: {fileID: 1140946066} + - component: {fileID: 1140946065} + m_Layer: 10 + m_Name: MidTimeTrigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1140946064 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1140946063} + m_LocalRotation: {x: -0, y: 0.12247562, z: -0, w: 0.9924716} + m_LocalPosition: {x: 90.62, y: -7.8, z: 37.8} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 918409136} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 14.07, z: 0} +--- !u!65 &1140946065 +BoxCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1140946063} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 62.673805, y: 6.871087, z: 1} + m_Center: {x: -5.696964, y: -2.9355435, z: 0.0000050792487} +--- !u!114 &1140946066 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1140946063} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3b15e07c006151644bf5890c327765c2, type: 3} + m_Name: + m_EditorClassIdentifier: + eventsType: 03000000 --- !u!1 &1141995116 GameObject: m_ObjectHideFlags: 0 diff --git a/ShowPT/Assets/Scripts/LilRobot.cs b/ShowPT/Assets/Scripts/LilRobot.cs index 2cd86af5..eb06eea7 100644 --- a/ShowPT/Assets/Scripts/LilRobot.cs +++ b/ShowPT/Assets/Scripts/LilRobot.cs @@ -236,6 +236,7 @@ private void OnCollisionEnter(Collision collision) { playerDamaged = true; collision.gameObject.GetComponent().ChangeHealth(-damage); + collision.gameObject.GetComponent().hitLil(); } } diff --git a/ShowPT/Assets/Scripts/PlayerHealth.cs b/ShowPT/Assets/Scripts/PlayerHealth.cs index 2f59c544..5d834596 100644 --- a/ShowPT/Assets/Scripts/PlayerHealth.cs +++ b/ShowPT/Assets/Scripts/PlayerHealth.cs @@ -1,4 +1,5 @@ -using System.Collections; +using System; +using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -36,6 +37,8 @@ public class PlayerHealth : MonoBehaviour { public AudioCollection damageCollection; public AudioCollection tvCollection; private ulong idClip = 0; + private bool playerDamagedFirstTimeLil; + private bool playerDamagedFirstTimeTurret; // Use this for initialization void Start () @@ -45,6 +48,8 @@ void Start () deathAnimation = playerCamera.GetComponent (); ctrlAudio = GameObject.FindGameObjectWithTag("CtrlAudio").GetComponent(); tweetSystem = FindObjectOfType (); + playerDamagedFirstTimeLil = false; + playerDamagedFirstTimeTurret = false; } void Update() @@ -135,4 +140,22 @@ public void buyHealth() { ChangeHealth(maxHealth); } + + public void hitLil() + { + if (!playerDamagedFirstTimeLil) + { + playerDamagedFirstTimeLil = true; + ctrlAudio.playOneSound(tvCollection.audioGroup, tvCollection[(int)GenericEvent.EventType.FIRSTLIL], Vector3.zero, 0.05f, 0f, tvCollection.priority); + } + } + + public void hitTurret() + { + if (!playerDamagedFirstTimeTurret) + { + playerDamagedFirstTimeTurret = true; + ctrlAudio.playOneSound(tvCollection.audioGroup, tvCollection[(int)GenericEvent.EventType.FIRSTORRET], Vector3.zero, 0.05f, 0f, tvCollection.priority); + } + } } diff --git a/ShowPT/Assets/Scripts/SnitchEnemy.cs b/ShowPT/Assets/Scripts/SnitchEnemy.cs index 5d0c760f..ebde4e67 100644 --- a/ShowPT/Assets/Scripts/SnitchEnemy.cs +++ b/ShowPT/Assets/Scripts/SnitchEnemy.cs @@ -10,6 +10,7 @@ public class SnitchEnemy : Enemy { GameObject bridge; [Header("Sounds")] + public AudioCollection tvCollection; public AudioClip snichSound; private ulong idSnichSound; @@ -56,7 +57,8 @@ public override void checkHealth() ctrAudio.stopSound(idSnichSound); ScoreController.addDead(ScoreController.Enemy.DRON); bridge.SetActive (true); - generateDeathEffect (); + ctrAudio.playOneSound(tvCollection.audioGroup, tvCollection[(int)GenericEvent.EventType.BRIDGE], Vector3.zero, 0.05f, 0f, tvCollection.priority); + generateDeathEffect (); } } diff --git a/ShowPT/Assets/Scripts/Turret.cs b/ShowPT/Assets/Scripts/Turret.cs index f94bd2d9..fd47da8f 100644 --- a/ShowPT/Assets/Scripts/Turret.cs +++ b/ShowPT/Assets/Scripts/Turret.cs @@ -126,6 +126,7 @@ public override void shoot() case "Player": PlayerHealth playerTemp = hit.transform.gameObject.GetComponent (); playerTemp.ChangeHealth (-shootDamage); + playerTemp.hitTurret(); break; } } diff --git a/ShowPT/Assets/Scripts/TurretEvent.cs b/ShowPT/Assets/Scripts/TurretEvent.cs deleted file mode 100644 index a0ab5520..00000000 --- a/ShowPT/Assets/Scripts/TurretEvent.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class TurretEvent : GenericEvent { - - public override void onEnableEvent() - { - - } -}