From 33be5d2aa981cd593ae449fb4102ad93cf2c59e8 Mon Sep 17 00:00:00 2001 From: Mingu Kim Date: Sat, 15 Feb 2025 19:28:24 +0900 Subject: [PATCH] =?UTF-8?q?=EB=AA=AC=EC=8A=A4=ED=84=B0=20=ED=94=84?= =?UTF-8?q?=EB=A6=AC=ED=8C=B9,=20=EB=AA=AC=EC=8A=A4=ED=84=B0=20=EC=8A=A4?= =?UTF-8?q?=ED=82=AC=20=ED=94=84=EB=A6=AC=ED=8C=B9=20=EB=88=84=EB=9D=BD?= =?UTF-8?q?=EB=90=9C=20=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=EB=B0=8F=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DragonBreathController.controller | 2 +- .../Art/monster skills/SmallFire.prefab.meta | 7 - .../MonsterPrefabs/Boss/BlackWerewolf.prefab | 29 +- .../MonsterPrefabs/Boss/BlueTroll.prefab | 29 +- .../MonsterPrefabs/Boss/RedRex.prefab | 29 +- .../Resources/MonsterPrefabs/LastBoss.meta | 8 + .../{ => LastBoss}/RedDragon.prefab | 27 +- .../{ => LastBoss}/RedDragon.prefab.meta | 0 .../MonsterPrefabs/Mid Boss/BlueRex.prefab | 29 +- .../Mid Boss/GreenPumpkin.prefab | 29 +- .../MonsterPrefabs/Mid Boss/GreenTroll.prefab | 29 +- .../MonsterSkillPrefabs}/DragonBreath.prefab | 100 +- .../DragonBreath.prefab.meta | 2 +- .../DragonShockWave.prefab | 100 +- .../DragonShockWave.prefab.meta | 2 +- .../MonsterSkillPrefabs/DropObject.prefab} | 108 +- .../DropObject.prefab.meta | 7 + .../MonsterSkillPrefabs}/FireImpact.prefab | 100 +- .../FireImpact.prefab.meta | 2 +- .../MonsterSkillPrefabs}/IceBlast.prefab | 100 +- .../MonsterSkillPrefabs}/IceBlast.prefab.meta | 2 +- .../MonsterSkillPrefabs}/PumpkinCrash.prefab | 100 +- .../PumpkinCrash.prefab.meta | 2 +- .../MonsterSkillPrefabs/SmallFire.prefab | 4 +- .../MonsterSkillPrefabs}/TrollCharge.prefab | 100 +- .../TrollCharge.prefab.meta | 2 +- .../MonsterSkillPrefabs}/TrollCrash.prefab | 96 +- .../TrollCrash.prefab.meta | 2 +- .../MonsterSkillPrefabs}/TrollThunde.prefab | 110 +- .../TrollThunde.prefab.meta | 2 +- .../WolfEnergyWave.prefab | 100 +- .../WolfEnergyWave.prefab.meta | 2 +- .../MonsterSkillPrefabs/WolfPunch.prefab} | 55 +- .../WolfPunch.prefab.meta | 2 +- .../Personal Scenes/dev_mingu/Ingame.unity | 1234 +++++++++-------- .../Gameton/Scripts/Monster/Eyesight.cs | 10 +- .../Gameton/Scripts/Monster/MonsterBase.cs | 28 +- .../Gameton/Scripts/Monster/MonsterSkill.cs | 2 +- .../Gameton/Scripts/Monster/StateMachine.cs | 34 +- 39 files changed, 1718 insertions(+), 908 deletions(-) delete mode 100644 Gameton-06/Assets/Gameton/Art/monster skills/SmallFire.prefab.meta create mode 100644 Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/LastBoss.meta rename Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/{ => LastBoss}/RedDragon.prefab (89%) rename Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/{ => LastBoss}/RedDragon.prefab.meta (100%) rename Gameton-06/Assets/Gameton/{Art/monster skills => Resources/MonsterSkillPrefabs}/DragonBreath.prefab (58%) rename Gameton-06/Assets/Gameton/{Art/monster skills => Resources/MonsterSkillPrefabs}/DragonBreath.prefab.meta (74%) rename Gameton-06/Assets/Gameton/{Art/monster skills => Resources/MonsterSkillPrefabs}/DragonShockWave.prefab (58%) rename Gameton-06/Assets/Gameton/{Art/monster skills => Resources/MonsterSkillPrefabs}/DragonShockWave.prefab.meta (74%) rename Gameton-06/Assets/Gameton/{Art/monster skills/WolfPunch.prefab => Resources/MonsterSkillPrefabs/DropObject.prefab} (53%) create mode 100644 Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/DropObject.prefab.meta rename Gameton-06/Assets/Gameton/{Art/monster skills => Resources/MonsterSkillPrefabs}/FireImpact.prefab (58%) rename Gameton-06/Assets/Gameton/{Art/monster skills => Resources/MonsterSkillPrefabs}/FireImpact.prefab.meta (74%) rename Gameton-06/Assets/Gameton/{Art/monster skills => Resources/MonsterSkillPrefabs}/IceBlast.prefab (58%) rename Gameton-06/Assets/Gameton/{Art/monster skills => Resources/MonsterSkillPrefabs}/IceBlast.prefab.meta (74%) rename Gameton-06/Assets/Gameton/{Art/monster skills => Resources/MonsterSkillPrefabs}/PumpkinCrash.prefab (58%) rename Gameton-06/Assets/Gameton/{Art/monster skills => Resources/MonsterSkillPrefabs}/PumpkinCrash.prefab.meta (74%) rename Gameton-06/Assets/Gameton/{Art/monster skills => Resources/MonsterSkillPrefabs}/TrollCharge.prefab (58%) rename Gameton-06/Assets/Gameton/{Art/monster skills => Resources/MonsterSkillPrefabs}/TrollCharge.prefab.meta (74%) rename Gameton-06/Assets/Gameton/{Art/monster skills => Resources/MonsterSkillPrefabs}/TrollCrash.prefab (59%) rename Gameton-06/Assets/Gameton/{Art/monster skills => Resources/MonsterSkillPrefabs}/TrollCrash.prefab.meta (74%) rename Gameton-06/Assets/Gameton/{Art/monster skills => Resources/MonsterSkillPrefabs}/TrollThunde.prefab (58%) rename Gameton-06/Assets/Gameton/{Art/monster skills => Resources/MonsterSkillPrefabs}/TrollThunde.prefab.meta (74%) rename Gameton-06/Assets/Gameton/{Art/monster skills => Resources/MonsterSkillPrefabs}/WolfEnergyWave.prefab (58%) rename Gameton-06/Assets/Gameton/{Art/monster skills => Resources/MonsterSkillPrefabs}/WolfEnergyWave.prefab.meta (74%) rename Gameton-06/Assets/Gameton/{Art/monster skills/SmallFire.prefab => Resources/MonsterSkillPrefabs/WolfPunch.prefab} (78%) rename Gameton-06/Assets/Gameton/{Art/monster skills => Resources/MonsterSkillPrefabs}/WolfPunch.prefab.meta (74%) diff --git a/Gameton-06/Assets/Gameton/Art/monster skills/DragonBreath/DragonBreathController.controller b/Gameton-06/Assets/Gameton/Art/monster skills/DragonBreath/DragonBreathController.controller index 5751ffed..3bdbcb11 100644 --- a/Gameton-06/Assets/Gameton/Art/monster skills/DragonBreath/DragonBreathController.controller +++ b/Gameton-06/Assets/Gameton/Art/monster skills/DragonBreath/DragonBreathController.controller @@ -11,7 +11,7 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -687469552740120413} - m_Position: {x: 200, y: 0, z: 0} + m_Position: {x: 240, y: 40, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Gameton-06/Assets/Gameton/Art/monster skills/SmallFire.prefab.meta b/Gameton-06/Assets/Gameton/Art/monster skills/SmallFire.prefab.meta deleted file mode 100644 index 849f4910..00000000 --- a/Gameton-06/Assets/Gameton/Art/monster skills/SmallFire.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 4ef2548480d47e244b87f430bbfbf910 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Boss/BlackWerewolf.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Boss/BlackWerewolf.prefab index 594118a2..c07a40b4 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Boss/BlackWerewolf.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Boss/BlackWerewolf.prefab @@ -228,22 +228,39 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: id: 0 - name: + monsterName: level: 0 currentHP: 0 attackPower: 0 - defensePower: 0 - monsterSkillID: + defencePower: 10 + monsterSkillID: 0 patrolRange: 0 detectionRange: 0 chaseRange: 0 speed: 3 attackRange: 0 - _spriteRenderer: {fileID: 592092508951316932} + _spriteRenderer: {fileID: 0} _target: {fileID: 0} - _collider: {fileID: 5515319325292286501} - defencePower: 10 + _collider: {fileID: 0} _hpBarImage: {fileID: 0} + skillId: 0 + skillName: + damage: 0 + cooldown: 0 + range: 0 + animationName: + smallFirePrefab: {fileID: 4487626989189845864, guid: 0cc74a53f6c5c944b86daaa75d4bc576, type: 3} + DragonBreathPrefab: {fileID: 1270587839958746621, guid: a7b411323f70c6c4db9d2cab98824bd2, type: 3} + IceBlastPrefab: {fileID: 5091201270221039787, guid: e0e47ef64af779949aef813fbc15f1b5, type: 3} + PumpkinCrashPrefab: {fileID: 6551207428356273061, guid: 4f642f085df0b924f895a1d23e67ad3f, type: 3} + TrollChargePrefab: {fileID: 5657264052368507626, guid: cc6826c2c28719f429e890d46db2808d, type: 3} + TrollCrashPrefab: {fileID: 7081223340028307245, guid: 6c84a8d8ff561714585abaed48ffb6b9, type: 3} + TrollThundePrefab: {fileID: 7017780489100943411, guid: c8c646b21c23a3340a14ddd62ce673b5, type: 3} + WolfEnergyWavePrefab: {fileID: 6602113715180894997, guid: 99c6c681f7d601445b6f970ee9b77109, type: 3} + WolfPunchPrefab: {fileID: 123878659603861660, guid: bdee23ac65f6d2b4bafefc94600190c8, type: 3} + DragonShockWavePrefab: {fileID: 3715909542404085769, guid: 358f073558c5daa4185d8950938ae415, type: 3} + FireImpactPrefab: {fileID: 6470166121172466421, guid: b12ab214fbad9a449bc80119f185111e, type: 3} + DropObjectPrefab: {fileID: 5413697641276301969, guid: 82350566434da384cb94c1c2624dbeae, type: 3} --- !u!1 &2525594216129178928 GameObject: m_ObjectHideFlags: 0 diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Boss/BlueTroll.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Boss/BlueTroll.prefab index 119cb38f..5322e73d 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Boss/BlueTroll.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Boss/BlueTroll.prefab @@ -309,22 +309,39 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: id: 0 - name: + monsterName: level: 0 currentHP: 0 attackPower: 0 - defensePower: 0 - monsterSkillID: + defencePower: 10 + monsterSkillID: 0 patrolRange: 0 detectionRange: 0 chaseRange: 0 speed: 3 attackRange: 0 - _spriteRenderer: {fileID: 4721946587208924001} + _spriteRenderer: {fileID: 0} _target: {fileID: 0} - _collider: {fileID: 892968019583906067} - defencePower: 10 + _collider: {fileID: 0} _hpBarImage: {fileID: 0} + skillId: 0 + skillName: + damage: 0 + cooldown: 0 + range: 0 + animationName: + smallFirePrefab: {fileID: 4487626989189845864, guid: 0cc74a53f6c5c944b86daaa75d4bc576, type: 3} + DragonBreathPrefab: {fileID: 1270587839958746621, guid: a7b411323f70c6c4db9d2cab98824bd2, type: 3} + IceBlastPrefab: {fileID: 5091201270221039787, guid: e0e47ef64af779949aef813fbc15f1b5, type: 3} + PumpkinCrashPrefab: {fileID: 6551207428356273061, guid: 4f642f085df0b924f895a1d23e67ad3f, type: 3} + TrollChargePrefab: {fileID: 5657264052368507626, guid: cc6826c2c28719f429e890d46db2808d, type: 3} + TrollCrashPrefab: {fileID: 7081223340028307245, guid: 6c84a8d8ff561714585abaed48ffb6b9, type: 3} + TrollThundePrefab: {fileID: 7017780489100943411, guid: c8c646b21c23a3340a14ddd62ce673b5, type: 3} + WolfEnergyWavePrefab: {fileID: 6602113715180894997, guid: 99c6c681f7d601445b6f970ee9b77109, type: 3} + WolfPunchPrefab: {fileID: 123878659603861660, guid: bdee23ac65f6d2b4bafefc94600190c8, type: 3} + DragonShockWavePrefab: {fileID: 3715909542404085769, guid: 358f073558c5daa4185d8950938ae415, type: 3} + FireImpactPrefab: {fileID: 6470166121172466421, guid: b12ab214fbad9a449bc80119f185111e, type: 3} + DropObjectPrefab: {fileID: 5413697641276301969, guid: 82350566434da384cb94c1c2624dbeae, type: 3} --- !u!1 &6755672999186651086 GameObject: m_ObjectHideFlags: 0 diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Boss/RedRex.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Boss/RedRex.prefab index 3a4137ed..c262314e 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Boss/RedRex.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Boss/RedRex.prefab @@ -309,22 +309,39 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: id: 0 - name: + monsterName: level: 0 currentHP: 0 attackPower: 0 - defensePower: 0 - monsterSkillID: + defencePower: 10 + monsterSkillID: 0 patrolRange: 0 detectionRange: 0 chaseRange: 0 speed: 3 attackRange: 0 - _spriteRenderer: {fileID: 7017725869417428001} + _spriteRenderer: {fileID: 0} _target: {fileID: 0} - _collider: {fileID: 6811142484219723541} - defencePower: 10 + _collider: {fileID: 0} _hpBarImage: {fileID: 0} + skillId: 0 + skillName: + damage: 0 + cooldown: 0 + range: 0 + animationName: + smallFirePrefab: {fileID: 4487626989189845864, guid: 0cc74a53f6c5c944b86daaa75d4bc576, type: 3} + DragonBreathPrefab: {fileID: 1270587839958746621, guid: a7b411323f70c6c4db9d2cab98824bd2, type: 3} + IceBlastPrefab: {fileID: 5091201270221039787, guid: e0e47ef64af779949aef813fbc15f1b5, type: 3} + PumpkinCrashPrefab: {fileID: 6551207428356273061, guid: 4f642f085df0b924f895a1d23e67ad3f, type: 3} + TrollChargePrefab: {fileID: 5657264052368507626, guid: cc6826c2c28719f429e890d46db2808d, type: 3} + TrollCrashPrefab: {fileID: 7081223340028307245, guid: 6c84a8d8ff561714585abaed48ffb6b9, type: 3} + TrollThundePrefab: {fileID: 7017780489100943411, guid: c8c646b21c23a3340a14ddd62ce673b5, type: 3} + WolfEnergyWavePrefab: {fileID: 6602113715180894997, guid: 99c6c681f7d601445b6f970ee9b77109, type: 3} + WolfPunchPrefab: {fileID: 123878659603861660, guid: bdee23ac65f6d2b4bafefc94600190c8, type: 3} + DragonShockWavePrefab: {fileID: 3715909542404085769, guid: 358f073558c5daa4185d8950938ae415, type: 3} + FireImpactPrefab: {fileID: 6470166121172466421, guid: b12ab214fbad9a449bc80119f185111e, type: 3} + DropObjectPrefab: {fileID: 5413697641276301969, guid: 82350566434da384cb94c1c2624dbeae, type: 3} --- !u!1 &6526698832639469074 GameObject: m_ObjectHideFlags: 0 diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/LastBoss.meta b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/LastBoss.meta new file mode 100644 index 00000000..1411cd44 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/LastBoss.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 538007106005a574b8912e62f777d038 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/RedDragon.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/LastBoss/RedDragon.prefab similarity index 89% rename from Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/RedDragon.prefab rename to Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/LastBoss/RedDragon.prefab index 1fd4b0b6..e7a6c5f7 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/RedDragon.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/LastBoss/RedDragon.prefab @@ -228,12 +228,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: id: 0 - name: + monsterName: level: 0 currentHP: 0 attackPower: 0 - defensePower: 0 - monsterSkillID: + defencePower: 10 + monsterSkillID: 0 patrolRange: 0 detectionRange: 0 chaseRange: 0 @@ -241,9 +241,26 @@ MonoBehaviour: attackRange: 0 _spriteRenderer: {fileID: 8612529477884142844} _target: {fileID: 0} - _collider: {fileID: 8290543774955921321} - defencePower: 10 + _collider: {fileID: 0} _hpBarImage: {fileID: 0} + skillId: 0 + skillName: + damage: 0 + cooldown: 0 + range: 0 + animationName: + smallFirePrefab: {fileID: 4487626989189845864, guid: 0cc74a53f6c5c944b86daaa75d4bc576, type: 3} + DragonBreathPrefab: {fileID: 1270587839958746621, guid: a7b411323f70c6c4db9d2cab98824bd2, type: 3} + IceBlastPrefab: {fileID: 5091201270221039787, guid: e0e47ef64af779949aef813fbc15f1b5, type: 3} + PumpkinCrashPrefab: {fileID: 6551207428356273061, guid: 4f642f085df0b924f895a1d23e67ad3f, type: 3} + TrollChargePrefab: {fileID: 5657264052368507626, guid: cc6826c2c28719f429e890d46db2808d, type: 3} + TrollCrashPrefab: {fileID: 7081223340028307245, guid: 6c84a8d8ff561714585abaed48ffb6b9, type: 3} + TrollThundePrefab: {fileID: 7017780489100943411, guid: c8c646b21c23a3340a14ddd62ce673b5, type: 3} + WolfEnergyWavePrefab: {fileID: 6602113715180894997, guid: 99c6c681f7d601445b6f970ee9b77109, type: 3} + WolfPunchPrefab: {fileID: 123878659603861660, guid: bdee23ac65f6d2b4bafefc94600190c8, type: 3} + DragonShockWavePrefab: {fileID: 3715909542404085769, guid: 358f073558c5daa4185d8950938ae415, type: 3} + FireImpactPrefab: {fileID: 6470166121172466421, guid: b12ab214fbad9a449bc80119f185111e, type: 3} + DropObjectPrefab: {fileID: 5413697641276301969, guid: 82350566434da384cb94c1c2624dbeae, type: 3} --- !u!1 &5762289934519905782 GameObject: m_ObjectHideFlags: 0 diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/RedDragon.prefab.meta b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/LastBoss/RedDragon.prefab.meta similarity index 100% rename from Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/RedDragon.prefab.meta rename to Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/LastBoss/RedDragon.prefab.meta diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Mid Boss/BlueRex.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Mid Boss/BlueRex.prefab index 0795f74a..c77e6f4c 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Mid Boss/BlueRex.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Mid Boss/BlueRex.prefab @@ -644,19 +644,36 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: id: 0 - name: + monsterName: level: 0 currentHP: 0 attackPower: 0 - defensePower: 0 - monsterSkillID: + defencePower: 10 + monsterSkillID: 0 patrolRange: 0 detectionRange: 0 chaseRange: 0 speed: 3 attackRange: 0 - _spriteRenderer: {fileID: 5120407950894233432} + _spriteRenderer: {fileID: 0} _target: {fileID: 0} - _collider: {fileID: 8795842210076893663} - defencePower: 10 + _collider: {fileID: 0} _hpBarImage: {fileID: 0} + skillId: 0 + skillName: + damage: 0 + cooldown: 0 + range: 0 + animationName: + smallFirePrefab: {fileID: 4487626989189845864, guid: 0cc74a53f6c5c944b86daaa75d4bc576, type: 3} + DragonBreathPrefab: {fileID: 1270587839958746621, guid: a7b411323f70c6c4db9d2cab98824bd2, type: 3} + IceBlastPrefab: {fileID: 5091201270221039787, guid: e0e47ef64af779949aef813fbc15f1b5, type: 3} + PumpkinCrashPrefab: {fileID: 6551207428356273061, guid: 4f642f085df0b924f895a1d23e67ad3f, type: 3} + TrollChargePrefab: {fileID: 5657264052368507626, guid: cc6826c2c28719f429e890d46db2808d, type: 3} + TrollCrashPrefab: {fileID: 7081223340028307245, guid: 6c84a8d8ff561714585abaed48ffb6b9, type: 3} + TrollThundePrefab: {fileID: 7017780489100943411, guid: c8c646b21c23a3340a14ddd62ce673b5, type: 3} + WolfEnergyWavePrefab: {fileID: 6602113715180894997, guid: 99c6c681f7d601445b6f970ee9b77109, type: 3} + WolfPunchPrefab: {fileID: 123878659603861660, guid: bdee23ac65f6d2b4bafefc94600190c8, type: 3} + DragonShockWavePrefab: {fileID: 3715909542404085769, guid: 358f073558c5daa4185d8950938ae415, type: 3} + FireImpactPrefab: {fileID: 6470166121172466421, guid: b12ab214fbad9a449bc80119f185111e, type: 3} + DropObjectPrefab: {fileID: 5413697641276301969, guid: 82350566434da384cb94c1c2624dbeae, type: 3} diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Mid Boss/GreenPumpkin.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Mid Boss/GreenPumpkin.prefab index e5102589..35f046ed 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Mid Boss/GreenPumpkin.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Mid Boss/GreenPumpkin.prefab @@ -229,22 +229,39 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: id: 0 - name: + monsterName: level: 0 currentHP: 0 attackPower: 0 - defensePower: 0 - monsterSkillID: + defencePower: 10 + monsterSkillID: 0 patrolRange: 0 detectionRange: 0 chaseRange: 0 speed: 3 attackRange: 0 - _spriteRenderer: {fileID: 453936598381272866} + _spriteRenderer: {fileID: 0} _target: {fileID: 0} - _collider: {fileID: 1925480105713998815} - defencePower: 10 + _collider: {fileID: 0} _hpBarImage: {fileID: 0} + skillId: 0 + skillName: + damage: 0 + cooldown: 0 + range: 0 + animationName: + smallFirePrefab: {fileID: 4487626989189845864, guid: 0cc74a53f6c5c944b86daaa75d4bc576, type: 3} + DragonBreathPrefab: {fileID: 1270587839958746621, guid: a7b411323f70c6c4db9d2cab98824bd2, type: 3} + IceBlastPrefab: {fileID: 5091201270221039787, guid: e0e47ef64af779949aef813fbc15f1b5, type: 3} + PumpkinCrashPrefab: {fileID: 6551207428356273061, guid: 4f642f085df0b924f895a1d23e67ad3f, type: 3} + TrollChargePrefab: {fileID: 5657264052368507626, guid: cc6826c2c28719f429e890d46db2808d, type: 3} + TrollCrashPrefab: {fileID: 7081223340028307245, guid: 6c84a8d8ff561714585abaed48ffb6b9, type: 3} + TrollThundePrefab: {fileID: 7017780489100943411, guid: c8c646b21c23a3340a14ddd62ce673b5, type: 3} + WolfEnergyWavePrefab: {fileID: 6602113715180894997, guid: 99c6c681f7d601445b6f970ee9b77109, type: 3} + WolfPunchPrefab: {fileID: 123878659603861660, guid: bdee23ac65f6d2b4bafefc94600190c8, type: 3} + DragonShockWavePrefab: {fileID: 3715909542404085769, guid: 358f073558c5daa4185d8950938ae415, type: 3} + FireImpactPrefab: {fileID: 6470166121172466421, guid: b12ab214fbad9a449bc80119f185111e, type: 3} + DropObjectPrefab: {fileID: 5413697641276301969, guid: 82350566434da384cb94c1c2624dbeae, type: 3} --- !u!1 &3020795925047894191 GameObject: m_ObjectHideFlags: 0 diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Mid Boss/GreenTroll.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Mid Boss/GreenTroll.prefab index cf7ff50b..c15c8776 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Mid Boss/GreenTroll.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Mid Boss/GreenTroll.prefab @@ -569,22 +569,39 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: id: 0 - name: + monsterName: level: 0 currentHP: 0 attackPower: 0 - defensePower: 0 - monsterSkillID: + defencePower: 10 + monsterSkillID: 0 patrolRange: 0 detectionRange: 0 chaseRange: 0 speed: 3 attackRange: 0 - _spriteRenderer: {fileID: 6858484445723671200} + _spriteRenderer: {fileID: 0} _target: {fileID: 0} - _collider: {fileID: 5655962962408652046} - defencePower: 10 + _collider: {fileID: 0} _hpBarImage: {fileID: 0} + skillId: 0 + skillName: + damage: 0 + cooldown: 0 + range: 0 + animationName: + smallFirePrefab: {fileID: 4487626989189845864, guid: 0cc74a53f6c5c944b86daaa75d4bc576, type: 3} + DragonBreathPrefab: {fileID: 1270587839958746621, guid: a7b411323f70c6c4db9d2cab98824bd2, type: 3} + IceBlastPrefab: {fileID: 5091201270221039787, guid: e0e47ef64af779949aef813fbc15f1b5, type: 3} + PumpkinCrashPrefab: {fileID: 6551207428356273061, guid: 4f642f085df0b924f895a1d23e67ad3f, type: 3} + TrollChargePrefab: {fileID: 5657264052368507626, guid: cc6826c2c28719f429e890d46db2808d, type: 3} + TrollCrashPrefab: {fileID: 7081223340028307245, guid: 6c84a8d8ff561714585abaed48ffb6b9, type: 3} + TrollThundePrefab: {fileID: 7017780489100943411, guid: c8c646b21c23a3340a14ddd62ce673b5, type: 3} + WolfEnergyWavePrefab: {fileID: 6602113715180894997, guid: 99c6c681f7d601445b6f970ee9b77109, type: 3} + WolfPunchPrefab: {fileID: 123878659603861660, guid: bdee23ac65f6d2b4bafefc94600190c8, type: 3} + DragonShockWavePrefab: {fileID: 3715909542404085769, guid: 358f073558c5daa4185d8950938ae415, type: 3} + FireImpactPrefab: {fileID: 6470166121172466421, guid: b12ab214fbad9a449bc80119f185111e, type: 3} + DropObjectPrefab: {fileID: 5413697641276301969, guid: 82350566434da384cb94c1c2624dbeae, type: 3} --- !u!1 &8136905868517816863 GameObject: m_ObjectHideFlags: 0 diff --git a/Gameton-06/Assets/Gameton/Art/monster skills/DragonBreath.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/DragonBreath.prefab similarity index 58% rename from Gameton-06/Assets/Gameton/Art/monster skills/DragonBreath.prefab rename to Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/DragonBreath.prefab index 539bf514..52a984c6 100644 --- a/Gameton-06/Assets/Gameton/Art/monster skills/DragonBreath.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/DragonBreath.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &8014733803982037796 +--- !u!1 &1270587839958746621 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,39 +8,42 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8075560268510171788} - - component: {fileID: 1235323057272069573} - - component: {fileID: 7693339951219642058} - - component: {fileID: 336307191674477566} + - component: {fileID: 1307078972646367573} + - component: {fileID: 8053692765299417} + - component: {fileID: 8583922660920151318} + - component: {fileID: 5984296414823984240} + - component: {fileID: 7110488446882450479} + - component: {fileID: 8584171356625432934} + - component: {fileID: 4333141993701116400} m_Layer: 0 m_Name: DragonBreath - m_TagString: Untagged + m_TagString: MonsterSkill m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &8075560268510171788 + m_IsActive: 1 +--- !u!4 &1307078972646367573 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8014733803982037796} + m_GameObject: {fileID: 1270587839958746621} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 9.299103, y: -5.700782, z: 0} - m_LocalScale: {x: 3, y: 3, z: 3} + m_LocalPosition: {x: 9.6, y: -6.82, z: 0} + m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1235323057272069573 +--- !u!212 &8053692765299417 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8014733803982037796} + m_GameObject: {fileID: 1270587839958746621} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -80,20 +83,20 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 0.48, y: 0.36} + m_Size: {x: 0.32, y: 0.2} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!95 &7693339951219642058 +--- !u!95 &8583922660920151318 Animator: serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8014733803982037796} + m_GameObject: {fileID: 1270587839958746621} m_Enabled: 1 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: 3e87347b6a532384d88fb0e10345306a, type: 2} @@ -107,13 +110,13 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!58 &336307191674477566 +--- !u!58 &5984296414823984240 CircleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8014733803982037796} + m_GameObject: {fileID: 1270587839958746621} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} @@ -136,9 +139,66 @@ CircleCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} serializedVersion: 2 - m_Radius: 0.24 + m_Radius: 0.16 +--- !u!50 &7110488446882450479 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1270587839958746621} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!114 &8584171356625432934 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1270587839958746621} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 190405d8d5d2c0e4683121e913af8457, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 5 + damage: 1 + _spriteRenderer: {fileID: 8053692765299417} +--- !u!111 &4333141993701116400 +Animation: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1270587839958746621} + m_Enabled: 1 + serializedVersion: 3 + m_Animation: {fileID: 0} + m_Animations: [] + m_WrapMode: 0 + m_PlayAutomatically: 1 + m_AnimatePhysics: 0 + m_CullingType: 0 diff --git a/Gameton-06/Assets/Gameton/Art/monster skills/DragonBreath.prefab.meta b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/DragonBreath.prefab.meta similarity index 74% rename from Gameton-06/Assets/Gameton/Art/monster skills/DragonBreath.prefab.meta rename to Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/DragonBreath.prefab.meta index 19cd6a1e..b5d86698 100644 --- a/Gameton-06/Assets/Gameton/Art/monster skills/DragonBreath.prefab.meta +++ b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/DragonBreath.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 847b8cde50ee6084fb5ba071905695ab +guid: a7b411323f70c6c4db9d2cab98824bd2 PrefabImporter: externalObjects: {} userData: diff --git a/Gameton-06/Assets/Gameton/Art/monster skills/DragonShockWave.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/DragonShockWave.prefab similarity index 58% rename from Gameton-06/Assets/Gameton/Art/monster skills/DragonShockWave.prefab rename to Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/DragonShockWave.prefab index 43e49974..10051b0b 100644 --- a/Gameton-06/Assets/Gameton/Art/monster skills/DragonShockWave.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/DragonShockWave.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1795041769684705213 +--- !u!1 &3715909542404085769 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,39 +8,42 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3651969231085591530} - - component: {fileID: 9160062381675153949} - - component: {fileID: 9038759654936242251} - - component: {fileID: 5558123191331748419} + - component: {fileID: 5897562606958307656} + - component: {fileID: 8885215099684820478} + - component: {fileID: 4225017373365588703} + - component: {fileID: 8327089364200567106} + - component: {fileID: 5054797441127699660} + - component: {fileID: 5541501053088130215} + - component: {fileID: 643858569014417936} m_Layer: 0 m_Name: DragonShockWave - m_TagString: Untagged + m_TagString: MonsterSkill m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &3651969231085591530 + m_IsActive: 1 +--- !u!4 &5897562606958307656 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1795041769684705213} + m_GameObject: {fileID: 3715909542404085769} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 9.67, y: -7.85, z: 0} - m_LocalScale: {x: 3, y: 3, z: 3} + m_LocalPosition: {x: 9.6, y: -6.82, z: 0} + m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &9160062381675153949 +--- !u!212 &8885215099684820478 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1795041769684705213} + m_GameObject: {fileID: 3715909542404085769} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -80,20 +83,20 @@ SpriteRenderer: m_FlipX: 1 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 0.86, y: 0.71} + m_Size: {x: 0.32, y: 0.2} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!95 &9038759654936242251 +--- !u!95 &4225017373365588703 Animator: serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1795041769684705213} + m_GameObject: {fileID: 3715909542404085769} m_Enabled: 1 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: 7db364b56eb7c824e9b5dc2f2c48793e, type: 2} @@ -107,13 +110,13 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!58 &5558123191331748419 +--- !u!58 &8327089364200567106 CircleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1795041769684705213} + m_GameObject: {fileID: 3715909542404085769} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} @@ -136,9 +139,66 @@ CircleCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} serializedVersion: 2 - m_Radius: 0.43 + m_Radius: 0.16 +--- !u!50 &5054797441127699660 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3715909542404085769} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!114 &5541501053088130215 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3715909542404085769} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 190405d8d5d2c0e4683121e913af8457, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 5 + damage: 1 + _spriteRenderer: {fileID: 8885215099684820478} +--- !u!111 &643858569014417936 +Animation: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3715909542404085769} + m_Enabled: 1 + serializedVersion: 3 + m_Animation: {fileID: 0} + m_Animations: [] + m_WrapMode: 0 + m_PlayAutomatically: 1 + m_AnimatePhysics: 0 + m_CullingType: 0 diff --git a/Gameton-06/Assets/Gameton/Art/monster skills/DragonShockWave.prefab.meta b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/DragonShockWave.prefab.meta similarity index 74% rename from Gameton-06/Assets/Gameton/Art/monster skills/DragonShockWave.prefab.meta rename to Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/DragonShockWave.prefab.meta index 2e426776..395c8315 100644 --- a/Gameton-06/Assets/Gameton/Art/monster skills/DragonShockWave.prefab.meta +++ b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/DragonShockWave.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 19e21beb53333714c9b20b94ef959530 +guid: 358f073558c5daa4185d8950938ae415 PrefabImporter: externalObjects: {} userData: diff --git a/Gameton-06/Assets/Gameton/Art/monster skills/WolfPunch.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/DropObject.prefab similarity index 53% rename from Gameton-06/Assets/Gameton/Art/monster skills/WolfPunch.prefab rename to Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/DropObject.prefab index 138103d6..f18e70c0 100644 --- a/Gameton-06/Assets/Gameton/Art/monster skills/WolfPunch.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/DropObject.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1829365216706540991 +--- !u!1 &5413697641276301969 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,39 +8,42 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6308569435698782878} - - component: {fileID: 4574069960962704504} - - component: {fileID: 1412728706848597817} - - component: {fileID: 8269112348003354554} + - component: {fileID: 3492436235769325888} + - component: {fileID: 8129513977779257605} + - component: {fileID: 568532890871045555} + - component: {fileID: 1584717097320002398} + - component: {fileID: 6838857846489357713} + - component: {fileID: 2603597439285502986} + - component: {fileID: 22246383895840250} m_Layer: 0 - m_Name: WolfPunch - m_TagString: Untagged + m_Name: DropObject + m_TagString: MonsterSkill m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &6308569435698782878 + m_IsActive: 1 +--- !u!4 &3492436235769325888 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1829365216706540991} + m_GameObject: {fileID: 5413697641276301969} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.460253, y: -3.1679468, z: 0} + m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} + m_LocalPosition: {x: 9.6, y: -3.29, z: 0} m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &4574069960962704504 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} +--- !u!212 &8129513977779257605 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1829365216706540991} + m_GameObject: {fileID: 5413697641276301969} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -75,28 +78,28 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: c9bcd3bc6752c8e4383556f093aa9c3d, type: 3} + m_Sprite: {fileID: 21300000, guid: 12fac0f9f312af54e9fc32b179373242, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 0.27, y: 0.24} + m_Size: {x: 0.32, y: 0.2} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!95 &1412728706848597817 +--- !u!95 &568532890871045555 Animator: serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1829365216706540991} + m_GameObject: {fileID: 5413697641276301969} m_Enabled: 1 m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 81e676ace79a0a8488dea24dfc4a742b, type: 2} + m_Controller: {fileID: 9100000, guid: 58e488ac3c50963479ffbf53cc9a5733, type: 2} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 0 @@ -107,13 +110,13 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!58 &8269112348003354554 +--- !u!58 &1584717097320002398 CircleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1829365216706540991} + m_GameObject: {fileID: 5413697641276301969} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} @@ -136,9 +139,66 @@ CircleCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} serializedVersion: 2 - m_Radius: 0.135 + m_Radius: 0.16 +--- !u!50 &6838857846489357713 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5413697641276301969} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!114 &2603597439285502986 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5413697641276301969} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 190405d8d5d2c0e4683121e913af8457, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 5 + damage: 1 + _spriteRenderer: {fileID: 8129513977779257605} +--- !u!111 &22246383895840250 +Animation: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5413697641276301969} + m_Enabled: 1 + serializedVersion: 3 + m_Animation: {fileID: 0} + m_Animations: [] + m_WrapMode: 0 + m_PlayAutomatically: 1 + m_AnimatePhysics: 0 + m_CullingType: 0 diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/DropObject.prefab.meta b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/DropObject.prefab.meta new file mode 100644 index 00000000..4c8e17f2 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/DropObject.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 82350566434da384cb94c1c2624dbeae +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Art/monster skills/FireImpact.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/FireImpact.prefab similarity index 58% rename from Gameton-06/Assets/Gameton/Art/monster skills/FireImpact.prefab rename to Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/FireImpact.prefab index e8e45f6d..82a52ca4 100644 --- a/Gameton-06/Assets/Gameton/Art/monster skills/FireImpact.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/FireImpact.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &525770732599868594 +--- !u!1 &6470166121172466421 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,39 +8,42 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7823250880881222516} - - component: {fileID: 6337019092001847274} - - component: {fileID: 7744462862839259561} - - component: {fileID: 4647139057136293787} + - component: {fileID: 7811880198066444325} + - component: {fileID: 2684352134087896452} + - component: {fileID: 787025779889851150} + - component: {fileID: 5145524256645407912} + - component: {fileID: 8545904500002042811} + - component: {fileID: 6123693339457368246} + - component: {fileID: 8959992671902869639} m_Layer: 0 m_Name: FireImpact - m_TagString: Untagged + m_TagString: MonsterSkill m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &7823250880881222516 + m_IsActive: 1 +--- !u!4 &7811880198066444325 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 525770732599868594} + m_GameObject: {fileID: 6470166121172466421} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -5.8601065, y: -8.271421, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalPosition: {x: 9.6, y: -6.82, z: 0} + m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &6337019092001847274 +--- !u!212 &2684352134087896452 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 525770732599868594} + m_GameObject: {fileID: 6470166121172466421} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -80,20 +83,20 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 0.62, y: 1.1} + m_Size: {x: 0.32, y: 0.2} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!95 &7744462862839259561 +--- !u!95 &787025779889851150 Animator: serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 525770732599868594} + m_GameObject: {fileID: 6470166121172466421} m_Enabled: 1 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: 12f2fa25107c6a74ab7ddd10048417ce, type: 2} @@ -107,13 +110,13 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!58 &4647139057136293787 +--- !u!58 &5145524256645407912 CircleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 525770732599868594} + m_GameObject: {fileID: 6470166121172466421} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} @@ -136,9 +139,66 @@ CircleCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} serializedVersion: 2 - m_Radius: 0.55 + m_Radius: 0.16 +--- !u!50 &8545904500002042811 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6470166121172466421} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!114 &6123693339457368246 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6470166121172466421} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 190405d8d5d2c0e4683121e913af8457, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 5 + damage: 1 + _spriteRenderer: {fileID: 2684352134087896452} +--- !u!111 &8959992671902869639 +Animation: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6470166121172466421} + m_Enabled: 1 + serializedVersion: 3 + m_Animation: {fileID: 0} + m_Animations: [] + m_WrapMode: 0 + m_PlayAutomatically: 1 + m_AnimatePhysics: 0 + m_CullingType: 0 diff --git a/Gameton-06/Assets/Gameton/Art/monster skills/FireImpact.prefab.meta b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/FireImpact.prefab.meta similarity index 74% rename from Gameton-06/Assets/Gameton/Art/monster skills/FireImpact.prefab.meta rename to Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/FireImpact.prefab.meta index 7093e2b1..95a9899c 100644 --- a/Gameton-06/Assets/Gameton/Art/monster skills/FireImpact.prefab.meta +++ b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/FireImpact.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c6cd355df76fd7e4eb6d5b0f6c008941 +guid: b12ab214fbad9a449bc80119f185111e PrefabImporter: externalObjects: {} userData: diff --git a/Gameton-06/Assets/Gameton/Art/monster skills/IceBlast.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/IceBlast.prefab similarity index 58% rename from Gameton-06/Assets/Gameton/Art/monster skills/IceBlast.prefab rename to Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/IceBlast.prefab index 505aa2e3..3e45b63d 100644 --- a/Gameton-06/Assets/Gameton/Art/monster skills/IceBlast.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/IceBlast.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &3081056546688452950 +--- !u!1 &5091201270221039787 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,39 +8,42 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1154300743199394583} - - component: {fileID: 4089938108527739965} - - component: {fileID: 7431387979761954366} - - component: {fileID: 4228958387668823224} + - component: {fileID: 4794064920761420331} + - component: {fileID: 4817860456564858319} + - component: {fileID: 6885093350029569572} + - component: {fileID: 7837298081562679334} + - component: {fileID: 8056643578045004534} + - component: {fileID: 474920881240547098} + - component: {fileID: 7926775962551934401} m_Layer: 0 m_Name: IceBlast - m_TagString: Untagged + m_TagString: MonsterSkill m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &1154300743199394583 + m_IsActive: 1 +--- !u!4 &4794064920761420331 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3081056546688452950} + m_GameObject: {fileID: 5091201270221039787} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 7.155012, y: -4.801734, z: 0} - m_LocalScale: {x: 3, y: 3, z: 3} + m_LocalPosition: {x: 9.6, y: -6.82, z: 0} + m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &4089938108527739965 +--- !u!212 &4817860456564858319 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3081056546688452950} + m_GameObject: {fileID: 5091201270221039787} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -80,20 +83,20 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 0.47, y: 0.32} + m_Size: {x: 0.32, y: 0.2} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!95 &7431387979761954366 +--- !u!95 &6885093350029569572 Animator: serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3081056546688452950} + m_GameObject: {fileID: 5091201270221039787} m_Enabled: 1 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: 7f57b37c17a5cc143ad507a6dc36059a, type: 2} @@ -107,13 +110,13 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!58 &4228958387668823224 +--- !u!58 &7837298081562679334 CircleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3081056546688452950} + m_GameObject: {fileID: 5091201270221039787} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} @@ -136,9 +139,66 @@ CircleCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} serializedVersion: 2 - m_Radius: 0.235 + m_Radius: 0.16 +--- !u!50 &8056643578045004534 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5091201270221039787} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!114 &474920881240547098 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5091201270221039787} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 190405d8d5d2c0e4683121e913af8457, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 5 + damage: 1 + _spriteRenderer: {fileID: 4817860456564858319} +--- !u!111 &7926775962551934401 +Animation: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5091201270221039787} + m_Enabled: 1 + serializedVersion: 3 + m_Animation: {fileID: 0} + m_Animations: [] + m_WrapMode: 0 + m_PlayAutomatically: 1 + m_AnimatePhysics: 0 + m_CullingType: 0 diff --git a/Gameton-06/Assets/Gameton/Art/monster skills/IceBlast.prefab.meta b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/IceBlast.prefab.meta similarity index 74% rename from Gameton-06/Assets/Gameton/Art/monster skills/IceBlast.prefab.meta rename to Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/IceBlast.prefab.meta index e7b5d3d1..abed933f 100644 --- a/Gameton-06/Assets/Gameton/Art/monster skills/IceBlast.prefab.meta +++ b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/IceBlast.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b3dc19b4ec6ac4d46895fb4d2913cfdd +guid: e0e47ef64af779949aef813fbc15f1b5 PrefabImporter: externalObjects: {} userData: diff --git a/Gameton-06/Assets/Gameton/Art/monster skills/PumpkinCrash.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/PumpkinCrash.prefab similarity index 58% rename from Gameton-06/Assets/Gameton/Art/monster skills/PumpkinCrash.prefab rename to Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/PumpkinCrash.prefab index fb751014..f101a0f6 100644 --- a/Gameton-06/Assets/Gameton/Art/monster skills/PumpkinCrash.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/PumpkinCrash.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1608946701812413035 +--- !u!1 &6551207428356273061 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,39 +8,42 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 712406083227680011} - - component: {fileID: 5907475282499855046} - - component: {fileID: 8826291491233630137} - - component: {fileID: 8535933117744393771} + - component: {fileID: 5815932945680858224} + - component: {fileID: 4479695262721233184} + - component: {fileID: 498327655730817293} + - component: {fileID: 3730048596841589478} + - component: {fileID: 8989973228021407057} + - component: {fileID: 3587667971006779655} + - component: {fileID: 947869301061931195} m_Layer: 0 m_Name: PumpkinCrash - m_TagString: Untagged + m_TagString: MonsterSkill m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &712406083227680011 + m_IsActive: 1 +--- !u!4 &5815932945680858224 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1608946701812413035} + m_GameObject: {fileID: 6551207428356273061} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.9759579, y: -4.7833967, z: 0} - m_LocalScale: {x: 3, y: 3, z: 3} + m_LocalPosition: {x: 9.6, y: -6.82, z: 0} + m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &5907475282499855046 +--- !u!212 &4479695262721233184 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1608946701812413035} + m_GameObject: {fileID: 6551207428356273061} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -80,20 +83,20 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 0.27, y: 0.26} + m_Size: {x: 0.32, y: 0.2} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!95 &8826291491233630137 +--- !u!95 &498327655730817293 Animator: serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1608946701812413035} + m_GameObject: {fileID: 6551207428356273061} m_Enabled: 1 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: eefa80a42a5e0fd42adf1e7308ecfdf0, type: 2} @@ -107,13 +110,13 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!58 &8535933117744393771 +--- !u!58 &3730048596841589478 CircleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1608946701812413035} + m_GameObject: {fileID: 6551207428356273061} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} @@ -136,9 +139,66 @@ CircleCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} serializedVersion: 2 - m_Radius: 0.135 + m_Radius: 0.16 +--- !u!50 &8989973228021407057 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6551207428356273061} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!114 &3587667971006779655 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6551207428356273061} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 190405d8d5d2c0e4683121e913af8457, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 5 + damage: 1 + _spriteRenderer: {fileID: 4479695262721233184} +--- !u!111 &947869301061931195 +Animation: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6551207428356273061} + m_Enabled: 1 + serializedVersion: 3 + m_Animation: {fileID: 0} + m_Animations: [] + m_WrapMode: 0 + m_PlayAutomatically: 1 + m_AnimatePhysics: 0 + m_CullingType: 0 diff --git a/Gameton-06/Assets/Gameton/Art/monster skills/PumpkinCrash.prefab.meta b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/PumpkinCrash.prefab.meta similarity index 74% rename from Gameton-06/Assets/Gameton/Art/monster skills/PumpkinCrash.prefab.meta rename to Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/PumpkinCrash.prefab.meta index 339b4227..050cd45b 100644 --- a/Gameton-06/Assets/Gameton/Art/monster skills/PumpkinCrash.prefab.meta +++ b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/PumpkinCrash.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f8d060861033d81469f4155bfd11daa4 +guid: 4f642f085df0b924f895a1d23e67ad3f PrefabImporter: externalObjects: {} userData: diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/SmallFire.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/SmallFire.prefab index 09bb4efa..acf7de3c 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/SmallFire.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/SmallFire.prefab @@ -184,9 +184,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 190405d8d5d2c0e4683121e913af8457, type: 3} m_Name: m_EditorClassIdentifier: - speed: 1 + speed: 5 damage: 1 - _spriteRenderer: {fileID: 0} + _spriteRenderer: {fileID: 4707592987925002032} --- !u!111 &1339834176233971923 Animation: m_ObjectHideFlags: 0 diff --git a/Gameton-06/Assets/Gameton/Art/monster skills/TrollCharge.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/TrollCharge.prefab similarity index 58% rename from Gameton-06/Assets/Gameton/Art/monster skills/TrollCharge.prefab rename to Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/TrollCharge.prefab index bd67a803..da093513 100644 --- a/Gameton-06/Assets/Gameton/Art/monster skills/TrollCharge.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/TrollCharge.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &7367244183296758141 +--- !u!1 &5657264052368507626 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,39 +8,42 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 9219918454524986119} - - component: {fileID: 4547942755828849648} - - component: {fileID: 4736415894357331426} - - component: {fileID: 1778541910630423631} + - component: {fileID: 3244724582992201572} + - component: {fileID: 8682394166578140873} + - component: {fileID: 6005792380637720625} + - component: {fileID: 3072966660169347942} + - component: {fileID: 9163858131445522055} + - component: {fileID: 1743096503760269675} + - component: {fileID: 8137806285949498767} m_Layer: 0 m_Name: TrollCharge - m_TagString: Untagged + m_TagString: MonsterSkill m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &9219918454524986119 + m_IsActive: 1 +--- !u!4 &3244724582992201572 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7367244183296758141} + m_GameObject: {fileID: 5657264052368507626} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.082218, y: -7.439744, z: 0} - m_LocalScale: {x: 3, y: 3, z: 3} + m_LocalPosition: {x: 9.6, y: -6.82, z: 0} + m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &4547942755828849648 +--- !u!212 &8682394166578140873 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7367244183296758141} + m_GameObject: {fileID: 5657264052368507626} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -80,20 +83,20 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 0.18, y: 0.36} + m_Size: {x: 0.32, y: 0.2} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!95 &4736415894357331426 +--- !u!95 &6005792380637720625 Animator: serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7367244183296758141} + m_GameObject: {fileID: 5657264052368507626} m_Enabled: 1 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: bf8ed19f31ea81543b700422b5582b24, type: 2} @@ -107,13 +110,13 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!58 &1778541910630423631 +--- !u!58 &3072966660169347942 CircleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7367244183296758141} + m_GameObject: {fileID: 5657264052368507626} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} @@ -136,9 +139,66 @@ CircleCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} serializedVersion: 2 - m_Radius: 0.18 + m_Radius: 0.16 +--- !u!50 &9163858131445522055 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5657264052368507626} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!114 &1743096503760269675 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5657264052368507626} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 190405d8d5d2c0e4683121e913af8457, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 5 + damage: 1 + _spriteRenderer: {fileID: 8682394166578140873} +--- !u!111 &8137806285949498767 +Animation: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5657264052368507626} + m_Enabled: 1 + serializedVersion: 3 + m_Animation: {fileID: 0} + m_Animations: [] + m_WrapMode: 0 + m_PlayAutomatically: 1 + m_AnimatePhysics: 0 + m_CullingType: 0 diff --git a/Gameton-06/Assets/Gameton/Art/monster skills/TrollCharge.prefab.meta b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/TrollCharge.prefab.meta similarity index 74% rename from Gameton-06/Assets/Gameton/Art/monster skills/TrollCharge.prefab.meta rename to Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/TrollCharge.prefab.meta index cff9d7ef..8f9e15ca 100644 --- a/Gameton-06/Assets/Gameton/Art/monster skills/TrollCharge.prefab.meta +++ b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/TrollCharge.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bc1772e0c748f3a4a90df1ccc5ffcf17 +guid: cc6826c2c28719f429e890d46db2808d PrefabImporter: externalObjects: {} userData: diff --git a/Gameton-06/Assets/Gameton/Art/monster skills/TrollCrash.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/TrollCrash.prefab similarity index 59% rename from Gameton-06/Assets/Gameton/Art/monster skills/TrollCrash.prefab rename to Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/TrollCrash.prefab index 6c7caea4..d6e40a10 100644 --- a/Gameton-06/Assets/Gameton/Art/monster skills/TrollCrash.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/TrollCrash.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &714358794190965353 +--- !u!1 &7081223340028307245 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,39 +8,42 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2659470572654768856} - - component: {fileID: 8309757342952129223} - - component: {fileID: 2478738288328703537} - - component: {fileID: 8993457184228394444} + - component: {fileID: 9039985568881264830} + - component: {fileID: 5881711247080977121} + - component: {fileID: 3410198553362980456} + - component: {fileID: 8932893945298640722} + - component: {fileID: 5586973428337069692} + - component: {fileID: 6795251015552035231} + - component: {fileID: 3981342205437233438} m_Layer: 0 m_Name: TrollCrash - m_TagString: Untagged + m_TagString: MonsterSkill m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &2659470572654768856 + m_IsActive: 1 +--- !u!4 &9039985568881264830 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 714358794190965353} + m_GameObject: {fileID: 7081223340028307245} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.30186653, y: -6.6080666, z: 0} + m_LocalPosition: {x: 9.6, y: -6.82, z: 0} m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &8309757342952129223 +--- !u!212 &5881711247080977121 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 714358794190965353} + m_GameObject: {fileID: 7081223340028307245} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -80,20 +83,20 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 0.32, y: 0.26} + m_Size: {x: 0.32, y: 0.2} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!95 &2478738288328703537 +--- !u!95 &3410198553362980456 Animator: serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 714358794190965353} + m_GameObject: {fileID: 7081223340028307245} m_Enabled: 1 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: 8e4122ea3e874884cbf0486cb1352381, type: 2} @@ -107,13 +110,13 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!58 &8993457184228394444 +--- !u!58 &8932893945298640722 CircleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 714358794190965353} + m_GameObject: {fileID: 7081223340028307245} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} @@ -136,9 +139,66 @@ CircleCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} serializedVersion: 2 m_Radius: 0.16 +--- !u!50 &5586973428337069692 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7081223340028307245} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!114 &6795251015552035231 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7081223340028307245} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 190405d8d5d2c0e4683121e913af8457, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 5 + damage: 1 + _spriteRenderer: {fileID: 5881711247080977121} +--- !u!111 &3981342205437233438 +Animation: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7081223340028307245} + m_Enabled: 1 + serializedVersion: 3 + m_Animation: {fileID: 0} + m_Animations: [] + m_WrapMode: 0 + m_PlayAutomatically: 1 + m_AnimatePhysics: 0 + m_CullingType: 0 diff --git a/Gameton-06/Assets/Gameton/Art/monster skills/TrollCrash.prefab.meta b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/TrollCrash.prefab.meta similarity index 74% rename from Gameton-06/Assets/Gameton/Art/monster skills/TrollCrash.prefab.meta rename to Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/TrollCrash.prefab.meta index 91aa36aa..6eb3028c 100644 --- a/Gameton-06/Assets/Gameton/Art/monster skills/TrollCrash.prefab.meta +++ b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/TrollCrash.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ed2ec0150da22c7498660f890b5d9d0b +guid: 6c84a8d8ff561714585abaed48ffb6b9 PrefabImporter: externalObjects: {} userData: diff --git a/Gameton-06/Assets/Gameton/Art/monster skills/TrollThunde.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/TrollThunde.prefab similarity index 58% rename from Gameton-06/Assets/Gameton/Art/monster skills/TrollThunde.prefab rename to Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/TrollThunde.prefab index f6dc6930..abffe854 100644 --- a/Gameton-06/Assets/Gameton/Art/monster skills/TrollThunde.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/TrollThunde.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &3283284706614470253 +--- !u!1 &7017780489100943411 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,39 +8,42 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7570296915314072495} - - component: {fileID: 6390079409906127656} - - component: {fileID: 1164105291805114512} - - component: {fileID: 8597073478448368213} + - component: {fileID: 7181440835666467509} + - component: {fileID: 6996097925627925270} + - component: {fileID: 4121797601386808181} + - component: {fileID: 5942239147517117630} + - component: {fileID: 6031164731437075766} + - component: {fileID: 949720681610508418} + - component: {fileID: 6649050052435975944} m_Layer: 0 m_Name: TrollThunde - m_TagString: Untagged + m_TagString: MonsterSkill m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &7570296915314072495 + m_IsActive: 1 +--- !u!4 &7181440835666467509 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3283284706614470253} + m_GameObject: {fileID: 7017780489100943411} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 5.8211794, y: -7.5909576, z: 0} + m_LocalPosition: {x: 9.6, y: -6.82, z: 0} m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &6390079409906127656 +--- !u!212 &6996097925627925270 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3283284706614470253} + m_GameObject: {fileID: 7017780489100943411} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -80,20 +83,20 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 0.05, y: 0.96} + m_Size: {x: 0.32, y: 0.2} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!95 &1164105291805114512 +--- !u!95 &4121797601386808181 Animator: serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3283284706614470253} + m_GameObject: {fileID: 7017780489100943411} m_Enabled: 1 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: 43847e1b9dab64b4aa1e3cc16e293e17, type: 2} @@ -107,13 +110,13 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!61 &8597073478448368213 -BoxCollider2D: +--- !u!58 &5942239147517117630 +CircleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3283284706614470253} + m_GameObject: {fileID: 7017780489100943411} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} @@ -136,19 +139,66 @@ BoxCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 0.05, y: 0.96} - newSize: {x: 0.05, y: 0.96} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 0.5, y: 0.96} - m_EdgeRadius: 0 + m_Radius: 0.16 +--- !u!50 &6031164731437075766 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7017780489100943411} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!114 &949720681610508418 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7017780489100943411} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 190405d8d5d2c0e4683121e913af8457, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 5 + damage: 1 + _spriteRenderer: {fileID: 6996097925627925270} +--- !u!111 &6649050052435975944 +Animation: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7017780489100943411} + m_Enabled: 1 + serializedVersion: 3 + m_Animation: {fileID: 0} + m_Animations: [] + m_WrapMode: 0 + m_PlayAutomatically: 1 + m_AnimatePhysics: 0 + m_CullingType: 0 diff --git a/Gameton-06/Assets/Gameton/Art/monster skills/TrollThunde.prefab.meta b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/TrollThunde.prefab.meta similarity index 74% rename from Gameton-06/Assets/Gameton/Art/monster skills/TrollThunde.prefab.meta rename to Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/TrollThunde.prefab.meta index cc6db36b..e687fa57 100644 --- a/Gameton-06/Assets/Gameton/Art/monster skills/TrollThunde.prefab.meta +++ b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/TrollThunde.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8882da46d30b7854f959b514d34d37a8 +guid: c8c646b21c23a3340a14ddd62ce673b5 PrefabImporter: externalObjects: {} userData: diff --git a/Gameton-06/Assets/Gameton/Art/monster skills/WolfEnergyWave.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/WolfEnergyWave.prefab similarity index 58% rename from Gameton-06/Assets/Gameton/Art/monster skills/WolfEnergyWave.prefab rename to Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/WolfEnergyWave.prefab index a888ea8a..11d773c4 100644 --- a/Gameton-06/Assets/Gameton/Art/monster skills/WolfEnergyWave.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/WolfEnergyWave.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &7397881325997545212 +--- !u!1 &6602113715180894997 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,39 +8,42 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2378062497565836813} - - component: {fileID: 5179598122244779194} - - component: {fileID: 1014114250848240424} - - component: {fileID: 674329978053756391} + - component: {fileID: 8035266354307835703} + - component: {fileID: 1499283199693592703} + - component: {fileID: 1191060077372862700} + - component: {fileID: 1254823644768031814} + - component: {fileID: 5292405800799182043} + - component: {fileID: 5965836241166699656} + - component: {fileID: 3239486102847560435} m_Layer: 0 m_Name: WolfEnergyWave - m_TagString: Untagged + m_TagString: MonsterSkill m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &2378062497565836813 + m_IsActive: 1 +--- !u!4 &8035266354307835703 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7397881325997545212} + m_GameObject: {fileID: 6602113715180894997} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.1724701, y: -7.704368, z: 0} - m_LocalScale: {x: 3, y: 3, z: 3} + m_LocalPosition: {x: 9.6, y: -6.82, z: 0} + m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &5179598122244779194 +--- !u!212 &1499283199693592703 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7397881325997545212} + m_GameObject: {fileID: 6602113715180894997} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -80,20 +83,20 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 0.49, y: 0.33} + m_Size: {x: 0.32, y: 0.2} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!95 &1014114250848240424 +--- !u!95 &1191060077372862700 Animator: serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7397881325997545212} + m_GameObject: {fileID: 6602113715180894997} m_Enabled: 1 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: 21a85fe4257aa594b956a8128a2b15cc, type: 2} @@ -107,13 +110,13 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!58 &674329978053756391 +--- !u!58 &1254823644768031814 CircleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7397881325997545212} + m_GameObject: {fileID: 6602113715180894997} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} @@ -136,9 +139,66 @@ CircleCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} serializedVersion: 2 - m_Radius: 0.245 + m_Radius: 0.16 +--- !u!50 &5292405800799182043 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6602113715180894997} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!114 &5965836241166699656 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6602113715180894997} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 190405d8d5d2c0e4683121e913af8457, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 5 + damage: 1 + _spriteRenderer: {fileID: 1499283199693592703} +--- !u!111 &3239486102847560435 +Animation: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6602113715180894997} + m_Enabled: 1 + serializedVersion: 3 + m_Animation: {fileID: 0} + m_Animations: [] + m_WrapMode: 0 + m_PlayAutomatically: 1 + m_AnimatePhysics: 0 + m_CullingType: 0 diff --git a/Gameton-06/Assets/Gameton/Art/monster skills/WolfEnergyWave.prefab.meta b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/WolfEnergyWave.prefab.meta similarity index 74% rename from Gameton-06/Assets/Gameton/Art/monster skills/WolfEnergyWave.prefab.meta rename to Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/WolfEnergyWave.prefab.meta index 8413f952..729ecd93 100644 --- a/Gameton-06/Assets/Gameton/Art/monster skills/WolfEnergyWave.prefab.meta +++ b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/WolfEnergyWave.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 367711e787044c046bac7792f506cd94 +guid: 99c6c681f7d601445b6f970ee9b77109 PrefabImporter: externalObjects: {} userData: diff --git a/Gameton-06/Assets/Gameton/Art/monster skills/SmallFire.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/WolfPunch.prefab similarity index 78% rename from Gameton-06/Assets/Gameton/Art/monster skills/SmallFire.prefab rename to Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/WolfPunch.prefab index a88eb323..e2a486f0 100644 --- a/Gameton-06/Assets/Gameton/Art/monster skills/SmallFire.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/WolfPunch.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &8753046487433099813 +--- !u!1 &123878659603861660 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,42 +8,42 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6011198421323057472} - - component: {fileID: 2313231889635043601} - - component: {fileID: 8906552074109778006} - - component: {fileID: 6070165933855076790} - - component: {fileID: 6952956518810006418} - - component: {fileID: 1967762321234574692} - - component: {fileID: 8413106534327317216} + - component: {fileID: 1972504249886802456} + - component: {fileID: 6727556030653340631} + - component: {fileID: 3704564354868999824} + - component: {fileID: 488110480534327625} + - component: {fileID: 2520265350606953410} + - component: {fileID: 8374477892765836817} + - component: {fileID: 7278308207326576809} m_Layer: 0 - m_Name: SmallFire + m_Name: WolfPunch m_TagString: MonsterSkill m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &6011198421323057472 +--- !u!4 &1972504249886802456 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8753046487433099813} + m_GameObject: {fileID: 123878659603861660} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 2.343256, y: -6.64587, z: 0} + m_LocalPosition: {x: 9.6, y: -6.82, z: 0} m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &2313231889635043601 +--- !u!212 &6727556030653340631 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8753046487433099813} + m_GameObject: {fileID: 123878659603861660} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -78,7 +78,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: dde1ef27cf5df374489b1b4a97f2b654, type: 3} + m_Sprite: {fileID: 21300000, guid: c9bcd3bc6752c8e4383556f093aa9c3d, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -89,17 +89,17 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!95 &8906552074109778006 +--- !u!95 &3704564354868999824 Animator: serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8753046487433099813} + m_GameObject: {fileID: 123878659603861660} m_Enabled: 1 m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 49f40d358006916488d6781f3ccffff6, type: 2} + m_Controller: {fileID: 9100000, guid: 81e676ace79a0a8488dea24dfc4a742b, type: 2} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 0 @@ -110,13 +110,13 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!58 &6070165933855076790 +--- !u!58 &488110480534327625 CircleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8753046487433099813} + m_GameObject: {fileID: 123878659603861660} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} @@ -145,14 +145,14 @@ CircleCollider2D: m_Offset: {x: 0, y: 0} serializedVersion: 2 m_Radius: 0.16 ---- !u!50 &6952956518810006418 +--- !u!50 &2520265350606953410 Rigidbody2D: serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8753046487433099813} + m_GameObject: {fileID: 123878659603861660} m_BodyType: 1 m_Simulated: 1 m_UseFullKinematicContacts: 0 @@ -172,27 +172,28 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 ---- !u!114 &1967762321234574692 +--- !u!114 &8374477892765836817 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8753046487433099813} + m_GameObject: {fileID: 123878659603861660} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 190405d8d5d2c0e4683121e913af8457, type: 3} m_Name: m_EditorClassIdentifier: - speed: 10 + speed: 5 damage: 1 ---- !u!111 &8413106534327317216 + _spriteRenderer: {fileID: 6727556030653340631} +--- !u!111 &7278308207326576809 Animation: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8753046487433099813} + m_GameObject: {fileID: 123878659603861660} m_Enabled: 1 serializedVersion: 3 m_Animation: {fileID: 0} diff --git a/Gameton-06/Assets/Gameton/Art/monster skills/WolfPunch.prefab.meta b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/WolfPunch.prefab.meta similarity index 74% rename from Gameton-06/Assets/Gameton/Art/monster skills/WolfPunch.prefab.meta rename to Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/WolfPunch.prefab.meta index f4daacd5..b376f450 100644 --- a/Gameton-06/Assets/Gameton/Art/monster skills/WolfPunch.prefab.meta +++ b/Gameton-06/Assets/Gameton/Resources/MonsterSkillPrefabs/WolfPunch.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c560409e8cc03ee4a9cbafef06a445d3 +guid: bdee23ac65f6d2b4bafefc94600190c8 PrefabImporter: externalObjects: {} userData: diff --git a/Gameton-06/Assets/Gameton/Scenes/Personal Scenes/dev_mingu/Ingame.unity b/Gameton-06/Assets/Gameton/Scenes/Personal Scenes/dev_mingu/Ingame.unity index d1e4c181..5783136a 100644 --- a/Gameton-06/Assets/Gameton/Scenes/Personal Scenes/dev_mingu/Ingame.unity +++ b/Gameton-06/Assets/Gameton/Scenes/Personal Scenes/dev_mingu/Ingame.unity @@ -6185,7 +6185,7 @@ MonoBehaviour: level: 0 currentHP: 0 attackPower: 0 - defensePower: 0 + defencePower: 10 monsterSkillID: 0 patrolRange: 0 detectionRange: 0 @@ -6195,7 +6195,6 @@ MonoBehaviour: _spriteRenderer: {fileID: 135546803} _target: {fileID: 0} _collider: {fileID: 0} - defencePower: 10 _hpBarImage: {fileID: 0} skillId: 0 skillName: @@ -6204,6 +6203,17 @@ MonoBehaviour: range: 0 animationName: smallFirePrefab: {fileID: 0} + DragonBreathPrefab: {fileID: 0} + IceBlastPrefab: {fileID: 0} + PumpkinCrashPrefab: {fileID: 0} + TrollChargePrefab: {fileID: 0} + TrollCrashPrefab: {fileID: 0} + TrollThundePrefab: {fileID: 0} + WolfEnergyWavePrefab: {fileID: 0} + WolfPunchPrefab: {fileID: 0} + DragonShockWavePrefab: {fileID: 0} + FireImpactPrefab: {fileID: 0} + DropObjectPrefab: {fileID: 0} --- !u!4 &141676838 stripped Transform: m_CorrespondingSourceObject: {fileID: 866829735663616565, guid: 1e126f96ebcf4245a3328353992d46f6, type: 3} @@ -13423,37 +13433,6 @@ MonoBehaviour: m_InstancedGameObject: {fileID: 0} m_Flags: 3 m_ColliderType: 1 ---- !u!1 &324269277 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 324269278} - m_Layer: 0 - m_Name: ---------------- (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &324269278 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 324269277} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 18.600946, y: 0.15916732, z: -0.007895203} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!213 &327795446 Sprite: m_ObjectHideFlags: 0 @@ -17756,7 +17735,7 @@ MonoBehaviour: level: 0 currentHP: 0 attackPower: 0 - defensePower: 0 + defencePower: 10 monsterSkillID: 0 patrolRange: 0 detectionRange: 0 @@ -17766,7 +17745,6 @@ MonoBehaviour: _spriteRenderer: {fileID: 431020305} _target: {fileID: 1333310376} _collider: {fileID: 2147245667} - defencePower: 10 _hpBarImage: {fileID: 309509381} skillId: 0 skillName: @@ -17775,6 +17753,17 @@ MonoBehaviour: range: 0 animationName: smallFirePrefab: {fileID: 4487626989189845864, guid: 0cc74a53f6c5c944b86daaa75d4bc576, type: 3} + DragonBreathPrefab: {fileID: 1270587839958746621, guid: a7b411323f70c6c4db9d2cab98824bd2, type: 3} + IceBlastPrefab: {fileID: 5091201270221039787, guid: e0e47ef64af779949aef813fbc15f1b5, type: 3} + PumpkinCrashPrefab: {fileID: 6551207428356273061, guid: 4f642f085df0b924f895a1d23e67ad3f, type: 3} + TrollChargePrefab: {fileID: 5657264052368507626, guid: cc6826c2c28719f429e890d46db2808d, type: 3} + TrollCrashPrefab: {fileID: 7081223340028307245, guid: 6c84a8d8ff561714585abaed48ffb6b9, type: 3} + TrollThundePrefab: {fileID: 7017780489100943411, guid: c8c646b21c23a3340a14ddd62ce673b5, type: 3} + WolfEnergyWavePrefab: {fileID: 6602113715180894997, guid: 99c6c681f7d601445b6f970ee9b77109, type: 3} + WolfPunchPrefab: {fileID: 123878659603861660, guid: bdee23ac65f6d2b4bafefc94600190c8, type: 3} + DragonShockWavePrefab: {fileID: 3715909542404085769, guid: 358f073558c5daa4185d8950938ae415, type: 3} + FireImpactPrefab: {fileID: 6470166121172466421, guid: b12ab214fbad9a449bc80119f185111e, type: 3} + DropObjectPrefab: {fileID: 5413697641276301969, guid: 82350566434da384cb94c1c2624dbeae, type: 3} --- !u!95 &431020300 Animator: serializedVersion: 5 @@ -43611,6 +43600,127 @@ Sprite: m_PhysicsShape: [] m_Bones: [] m_SpriteID: +--- !u!1001 &1043803241 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 172749484477612116, guid: ef14281ca23119941b755a7bff7ff6c8, type: 3} + propertyPath: _target + value: + objectReference: {fileID: 1333310376} + - target: {fileID: 172749484477612116, guid: ef14281ca23119941b755a7bff7ff6c8, type: 3} + propertyPath: _collider + value: + objectReference: {fileID: 2147245667} + - target: {fileID: 172749484477612116, guid: ef14281ca23119941b755a7bff7ff6c8, type: 3} + propertyPath: _hpBarImage + value: + objectReference: {fileID: 0} + - target: {fileID: 172749484477612116, guid: ef14281ca23119941b755a7bff7ff6c8, type: 3} + propertyPath: IceBlastPrefab + value: + objectReference: {fileID: 5091201270221039787, guid: e0e47ef64af779949aef813fbc15f1b5, type: 3} + - target: {fileID: 172749484477612116, guid: ef14281ca23119941b755a7bff7ff6c8, type: 3} + propertyPath: WolfPunchPrefab + value: + objectReference: {fileID: 123878659603861660, guid: bdee23ac65f6d2b4bafefc94600190c8, type: 3} + - target: {fileID: 172749484477612116, guid: ef14281ca23119941b755a7bff7ff6c8, type: 3} + propertyPath: _spriteRenderer + value: + objectReference: {fileID: 431020305} + - target: {fileID: 172749484477612116, guid: ef14281ca23119941b755a7bff7ff6c8, type: 3} + propertyPath: smallFirePrefab + value: + objectReference: {fileID: 4487626989189845864, guid: 0cc74a53f6c5c944b86daaa75d4bc576, type: 3} + - target: {fileID: 172749484477612116, guid: ef14281ca23119941b755a7bff7ff6c8, type: 3} + propertyPath: DropObjectPrefab + value: + objectReference: {fileID: 5413697641276301969, guid: 82350566434da384cb94c1c2624dbeae, type: 3} + - target: {fileID: 172749484477612116, guid: ef14281ca23119941b755a7bff7ff6c8, type: 3} + propertyPath: FireImpactPrefab + value: + objectReference: {fileID: 6470166121172466421, guid: b12ab214fbad9a449bc80119f185111e, type: 3} + - target: {fileID: 172749484477612116, guid: ef14281ca23119941b755a7bff7ff6c8, type: 3} + propertyPath: TrollCrashPrefab + value: + objectReference: {fileID: 7081223340028307245, guid: 6c84a8d8ff561714585abaed48ffb6b9, type: 3} + - target: {fileID: 172749484477612116, guid: ef14281ca23119941b755a7bff7ff6c8, type: 3} + propertyPath: TrollChargePrefab + value: + objectReference: {fileID: 5657264052368507626, guid: cc6826c2c28719f429e890d46db2808d, type: 3} + - target: {fileID: 172749484477612116, guid: ef14281ca23119941b755a7bff7ff6c8, type: 3} + propertyPath: TrollThundePrefab + value: + objectReference: {fileID: 7017780489100943411, guid: c8c646b21c23a3340a14ddd62ce673b5, type: 3} + - target: {fileID: 172749484477612116, guid: ef14281ca23119941b755a7bff7ff6c8, type: 3} + propertyPath: DragonBreathPrefab + value: + objectReference: {fileID: 1270587839958746621, guid: a7b411323f70c6c4db9d2cab98824bd2, type: 3} + - target: {fileID: 172749484477612116, guid: ef14281ca23119941b755a7bff7ff6c8, type: 3} + propertyPath: PumpkinCrashPrefab + value: + objectReference: {fileID: 6551207428356273061, guid: 4f642f085df0b924f895a1d23e67ad3f, type: 3} + - target: {fileID: 172749484477612116, guid: ef14281ca23119941b755a7bff7ff6c8, type: 3} + propertyPath: WolfEnergyWavePrefab + value: + objectReference: {fileID: 6602113715180894997, guid: 99c6c681f7d601445b6f970ee9b77109, type: 3} + - target: {fileID: 172749484477612116, guid: ef14281ca23119941b755a7bff7ff6c8, type: 3} + propertyPath: DragonShockWavePrefab + value: + objectReference: {fileID: 3715909542404085769, guid: 358f073558c5daa4185d8950938ae415, type: 3} + - target: {fileID: 1842826254400309060, guid: ef14281ca23119941b755a7bff7ff6c8, type: 3} + propertyPath: m_LocalPosition.x + value: 1.04 + objectReference: {fileID: 0} + - target: {fileID: 1842826254400309060, guid: ef14281ca23119941b755a7bff7ff6c8, type: 3} + propertyPath: m_LocalPosition.y + value: -7.28 + objectReference: {fileID: 0} + - target: {fileID: 1842826254400309060, guid: ef14281ca23119941b755a7bff7ff6c8, type: 3} + propertyPath: m_LocalPosition.z + value: 0.060982164 + objectReference: {fileID: 0} + - target: {fileID: 1842826254400309060, guid: ef14281ca23119941b755a7bff7ff6c8, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1842826254400309060, guid: ef14281ca23119941b755a7bff7ff6c8, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1842826254400309060, guid: ef14281ca23119941b755a7bff7ff6c8, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1842826254400309060, guid: ef14281ca23119941b755a7bff7ff6c8, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1842826254400309060, guid: ef14281ca23119941b755a7bff7ff6c8, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1842826254400309060, guid: ef14281ca23119941b755a7bff7ff6c8, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1842826254400309060, guid: ef14281ca23119941b755a7bff7ff6c8, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3667660097767351871, guid: ef14281ca23119941b755a7bff7ff6c8, type: 3} + propertyPath: m_Name + value: RedDragon + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ef14281ca23119941b755a7bff7ff6c8, type: 3} --- !u!213 &1044714798 Sprite: m_ObjectHideFlags: 0 @@ -48785,7 +48895,7 @@ MonoBehaviour: level: 0 currentHP: 0 attackPower: 0 - defensePower: 0 + defencePower: 10 monsterSkillID: 0 patrolRange: 0 detectionRange: 0 @@ -48795,7 +48905,6 @@ MonoBehaviour: _spriteRenderer: {fileID: 1254298208} _target: {fileID: 1333310376} _collider: {fileID: 199081697} - defencePower: 10 _hpBarImage: {fileID: 0} skillId: 0 skillName: @@ -48804,6 +48913,17 @@ MonoBehaviour: range: 0 animationName: smallFirePrefab: {fileID: 0} + DragonBreathPrefab: {fileID: 0} + IceBlastPrefab: {fileID: 0} + PumpkinCrashPrefab: {fileID: 0} + TrollChargePrefab: {fileID: 0} + TrollCrashPrefab: {fileID: 0} + TrollThundePrefab: {fileID: 0} + WolfEnergyWavePrefab: {fileID: 0} + WolfPunchPrefab: {fileID: 0} + DragonShockWavePrefab: {fileID: 0} + FireImpactPrefab: {fileID: 0} + DropObjectPrefab: {fileID: 0} --- !u!95 &1254298203 Animator: serializedVersion: 5 @@ -58993,7 +59113,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -2253911629886400664, guid: 06e11f99937f3f940bcf4f4bbb0a9fad, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: -2253911629886400664, guid: 06e11f99937f3f940bcf4f4bbb0a9fad, type: 3} propertyPath: m_TagString @@ -73373,7 +73493,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3656570700648378249, guid: f92c93d0d7d455d40b84e993e40acfca, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8528093570479225059, guid: f92c93d0d7d455d40b84e993e40acfca, type: 3} propertyPath: m_LocalScale.z @@ -73381,11 +73501,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8528093570479225059, guid: f92c93d0d7d455d40b84e993e40acfca, type: 3} propertyPath: m_LocalPosition.x - value: -2.36 + value: 9.21 objectReference: {fileID: 0} - target: {fileID: 8528093570479225059, guid: f92c93d0d7d455d40b84e993e40acfca, type: 3} propertyPath: m_LocalPosition.y - value: -1.5 + value: -8.61 objectReference: {fileID: 0} - target: {fileID: 8528093570479225059, guid: f92c93d0d7d455d40b84e993e40acfca, type: 3} propertyPath: m_LocalPosition.z @@ -73742,7 +73862,7 @@ MonoBehaviour: level: 0 currentHP: 0 attackPower: 0 - defensePower: 0 + defencePower: 10 monsterSkillID: 0 patrolRange: 0 detectionRange: 0 @@ -73752,7 +73872,6 @@ MonoBehaviour: _spriteRenderer: {fileID: 2041544010} _target: {fileID: 1333310376} _collider: {fileID: 483107484} - defencePower: 10 _hpBarImage: {fileID: 0} skillId: 0 skillName: @@ -73761,6 +73880,17 @@ MonoBehaviour: range: 0 animationName: smallFirePrefab: {fileID: 0} + DragonBreathPrefab: {fileID: 0} + IceBlastPrefab: {fileID: 0} + PumpkinCrashPrefab: {fileID: 0} + TrollChargePrefab: {fileID: 0} + TrollCrashPrefab: {fileID: 0} + TrollThundePrefab: {fileID: 0} + WolfEnergyWavePrefab: {fileID: 0} + WolfPunchPrefab: {fileID: 0} + DragonShockWavePrefab: {fileID: 0} + FireImpactPrefab: {fileID: 0} + DropObjectPrefab: {fileID: 0} --- !u!95 &2041544005 Animator: serializedVersion: 5 @@ -76021,67 +76151,6 @@ Sprite: m_PhysicsShape: [] m_Bones: [] m_SpriteID: ---- !u!1001 &2131259786 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1762751622269960499, guid: c28b253474f28e54ebeca15f342c2482, type: 3} - propertyPath: m_Name - value: SpriteEffect - objectReference: {fileID: 0} - - target: {fileID: 1762751622269960499, guid: c28b253474f28e54ebeca15f342c2482, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1762751622269960500, guid: c28b253474f28e54ebeca15f342c2482, type: 3} - propertyPath: m_LocalPosition.x - value: -4 - objectReference: {fileID: 0} - - target: {fileID: 1762751622269960500, guid: c28b253474f28e54ebeca15f342c2482, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1762751622269960500, guid: c28b253474f28e54ebeca15f342c2482, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1762751622269960500, guid: c28b253474f28e54ebeca15f342c2482, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1762751622269960500, guid: c28b253474f28e54ebeca15f342c2482, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1762751622269960500, guid: c28b253474f28e54ebeca15f342c2482, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1762751622269960500, guid: c28b253474f28e54ebeca15f342c2482, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1762751622269960500, guid: c28b253474f28e54ebeca15f342c2482, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1762751622269960500, guid: c28b253474f28e54ebeca15f342c2482, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1762751622269960500, guid: c28b253474f28e54ebeca15f342c2482, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: c28b253474f28e54ebeca15f342c2482, type: 3} --- !u!114 &2132150059 MonoBehaviour: m_ObjectHideFlags: 0 @@ -76989,7 +77058,7 @@ Sprite: m_PhysicsShape: [] m_Bones: [] m_SpriteID: ---- !u!1001 &656779510139692607 +--- !u!1001 &672402718813478257 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -76997,47 +77066,47 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 3283284706614470253, guid: 8882da46d30b7854f959b514d34d37a8, type: 3} + - target: {fileID: 7017780489100943411, guid: c8c646b21c23a3340a14ddd62ce673b5, type: 3} propertyPath: m_Name value: TrollThunde objectReference: {fileID: 0} - - target: {fileID: 7570296915314072495, guid: 8882da46d30b7854f959b514d34d37a8, type: 3} + - target: {fileID: 7181440835666467509, guid: c8c646b21c23a3340a14ddd62ce673b5, type: 3} propertyPath: m_LocalPosition.x - value: 5.8211794 + value: 9.6 objectReference: {fileID: 0} - - target: {fileID: 7570296915314072495, guid: 8882da46d30b7854f959b514d34d37a8, type: 3} + - target: {fileID: 7181440835666467509, guid: c8c646b21c23a3340a14ddd62ce673b5, type: 3} propertyPath: m_LocalPosition.y - value: -7.5909576 + value: -6.82 objectReference: {fileID: 0} - - target: {fileID: 7570296915314072495, guid: 8882da46d30b7854f959b514d34d37a8, type: 3} + - target: {fileID: 7181440835666467509, guid: c8c646b21c23a3340a14ddd62ce673b5, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7570296915314072495, guid: 8882da46d30b7854f959b514d34d37a8, type: 3} + - target: {fileID: 7181440835666467509, guid: c8c646b21c23a3340a14ddd62ce673b5, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 7570296915314072495, guid: 8882da46d30b7854f959b514d34d37a8, type: 3} + - target: {fileID: 7181440835666467509, guid: c8c646b21c23a3340a14ddd62ce673b5, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7570296915314072495, guid: 8882da46d30b7854f959b514d34d37a8, type: 3} + - target: {fileID: 7181440835666467509, guid: c8c646b21c23a3340a14ddd62ce673b5, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7570296915314072495, guid: 8882da46d30b7854f959b514d34d37a8, type: 3} + - target: {fileID: 7181440835666467509, guid: c8c646b21c23a3340a14ddd62ce673b5, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7570296915314072495, guid: 8882da46d30b7854f959b514d34d37a8, type: 3} + - target: {fileID: 7181440835666467509, guid: c8c646b21c23a3340a14ddd62ce673b5, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7570296915314072495, guid: 8882da46d30b7854f959b514d34d37a8, type: 3} + - target: {fileID: 7181440835666467509, guid: c8c646b21c23a3340a14ddd62ce673b5, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7570296915314072495, guid: 8882da46d30b7854f959b514d34d37a8, type: 3} + - target: {fileID: 7181440835666467509, guid: c8c646b21c23a3340a14ddd62ce673b5, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} @@ -77045,8 +77114,8 @@ PrefabInstance: m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 8882da46d30b7854f959b514d34d37a8, type: 3} ---- !u!1001 &2698727206670674272 + m_SourcePrefab: {fileID: 100100000, guid: c8c646b21c23a3340a14ddd62ce673b5, type: 3} +--- !u!1001 &1219945226467407874 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -77054,458 +77123,47 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 8014733803982037796, guid: 847b8cde50ee6084fb5ba071905695ab, type: 3} - propertyPath: m_Name - value: DragonBreath - objectReference: {fileID: 0} - - target: {fileID: 8075560268510171788, guid: 847b8cde50ee6084fb5ba071905695ab, type: 3} - propertyPath: m_LocalPosition.x - value: 9.299103 - objectReference: {fileID: 0} - - target: {fileID: 8075560268510171788, guid: 847b8cde50ee6084fb5ba071905695ab, type: 3} - propertyPath: m_LocalPosition.y - value: -5.700782 - objectReference: {fileID: 0} - - target: {fileID: 8075560268510171788, guid: 847b8cde50ee6084fb5ba071905695ab, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8075560268510171788, guid: 847b8cde50ee6084fb5ba071905695ab, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8075560268510171788, guid: 847b8cde50ee6084fb5ba071905695ab, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8075560268510171788, guid: 847b8cde50ee6084fb5ba071905695ab, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8075560268510171788, guid: 847b8cde50ee6084fb5ba071905695ab, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8075560268510171788, guid: 847b8cde50ee6084fb5ba071905695ab, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8075560268510171788, guid: 847b8cde50ee6084fb5ba071905695ab, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8075560268510171788, guid: 847b8cde50ee6084fb5ba071905695ab, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 847b8cde50ee6084fb5ba071905695ab, type: 3} ---- !u!1001 &3102516619230165340 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 7367244183296758141, guid: bc1772e0c748f3a4a90df1ccc5ffcf17, type: 3} - propertyPath: m_Name - value: TrollCharge - objectReference: {fileID: 0} - - target: {fileID: 9219918454524986119, guid: bc1772e0c748f3a4a90df1ccc5ffcf17, type: 3} - propertyPath: m_LocalPosition.x - value: 4.082218 - objectReference: {fileID: 0} - - target: {fileID: 9219918454524986119, guid: bc1772e0c748f3a4a90df1ccc5ffcf17, type: 3} - propertyPath: m_LocalPosition.y - value: -7.439744 - objectReference: {fileID: 0} - - target: {fileID: 9219918454524986119, guid: bc1772e0c748f3a4a90df1ccc5ffcf17, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9219918454524986119, guid: bc1772e0c748f3a4a90df1ccc5ffcf17, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9219918454524986119, guid: bc1772e0c748f3a4a90df1ccc5ffcf17, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9219918454524986119, guid: bc1772e0c748f3a4a90df1ccc5ffcf17, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9219918454524986119, guid: bc1772e0c748f3a4a90df1ccc5ffcf17, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9219918454524986119, guid: bc1772e0c748f3a4a90df1ccc5ffcf17, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9219918454524986119, guid: bc1772e0c748f3a4a90df1ccc5ffcf17, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9219918454524986119, guid: bc1772e0c748f3a4a90df1ccc5ffcf17, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: bc1772e0c748f3a4a90df1ccc5ffcf17, type: 3} ---- !u!1001 &3241122426496265767 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2536514247983345043, guid: 38634a6f4f9850d47baa381790643b17, type: 3} - propertyPath: m_LocalPosition.x - value: 7.99 - objectReference: {fileID: 0} - - target: {fileID: 2536514247983345043, guid: 38634a6f4f9850d47baa381790643b17, type: 3} - propertyPath: m_LocalPosition.y - value: -0.26 - objectReference: {fileID: 0} - - target: {fileID: 2536514247983345043, guid: 38634a6f4f9850d47baa381790643b17, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2536514247983345043, guid: 38634a6f4f9850d47baa381790643b17, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 2536514247983345043, guid: 38634a6f4f9850d47baa381790643b17, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2536514247983345043, guid: 38634a6f4f9850d47baa381790643b17, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2536514247983345043, guid: 38634a6f4f9850d47baa381790643b17, type: 3} - propertyPath: m_LocalRotation.z - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 2536514247983345043, guid: 38634a6f4f9850d47baa381790643b17, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2536514247983345043, guid: 38634a6f4f9850d47baa381790643b17, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2536514247983345043, guid: 38634a6f4f9850d47baa381790643b17, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 90 - objectReference: {fileID: 0} - - target: {fileID: 6302599676933473050, guid: 38634a6f4f9850d47baa381790643b17, type: 3} - propertyPath: m_SortingLayer - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6302599676933473050, guid: 38634a6f4f9850d47baa381790643b17, type: 3} - propertyPath: m_SortingLayerID - value: -2014068629 - objectReference: {fileID: 0} - - target: {fileID: 7658488480574400878, guid: 38634a6f4f9850d47baa381790643b17, type: 3} - propertyPath: m_Name - value: DropObject - objectReference: {fileID: 0} - - target: {fileID: 7658488480574400878, guid: 38634a6f4f9850d47baa381790643b17, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 38634a6f4f9850d47baa381790643b17, type: 3} ---- !u!1001 &5291620879968733237 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1829365216706540991, guid: c560409e8cc03ee4a9cbafef06a445d3, type: 3} - propertyPath: m_Name - value: WolfPunch - objectReference: {fileID: 0} - - target: {fileID: 6308569435698782878, guid: c560409e8cc03ee4a9cbafef06a445d3, type: 3} - propertyPath: m_LocalPosition.x - value: 4.460253 - objectReference: {fileID: 0} - - target: {fileID: 6308569435698782878, guid: c560409e8cc03ee4a9cbafef06a445d3, type: 3} - propertyPath: m_LocalPosition.y - value: -3.1679468 - objectReference: {fileID: 0} - - target: {fileID: 6308569435698782878, guid: c560409e8cc03ee4a9cbafef06a445d3, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6308569435698782878, guid: c560409e8cc03ee4a9cbafef06a445d3, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6308569435698782878, guid: c560409e8cc03ee4a9cbafef06a445d3, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6308569435698782878, guid: c560409e8cc03ee4a9cbafef06a445d3, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6308569435698782878, guid: c560409e8cc03ee4a9cbafef06a445d3, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6308569435698782878, guid: c560409e8cc03ee4a9cbafef06a445d3, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6308569435698782878, guid: c560409e8cc03ee4a9cbafef06a445d3, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6308569435698782878, guid: c560409e8cc03ee4a9cbafef06a445d3, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: c560409e8cc03ee4a9cbafef06a445d3, type: 3} ---- !u!1001 &5448443593561372940 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1795041769684705213, guid: 19e21beb53333714c9b20b94ef959530, type: 3} - propertyPath: m_Name - value: DragonShockWave - objectReference: {fileID: 0} - - target: {fileID: 3651969231085591530, guid: 19e21beb53333714c9b20b94ef959530, type: 3} - propertyPath: m_LocalPosition.x - value: 9.67 - objectReference: {fileID: 0} - - target: {fileID: 3651969231085591530, guid: 19e21beb53333714c9b20b94ef959530, type: 3} - propertyPath: m_LocalPosition.y - value: -7.85 - objectReference: {fileID: 0} - - target: {fileID: 3651969231085591530, guid: 19e21beb53333714c9b20b94ef959530, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3651969231085591530, guid: 19e21beb53333714c9b20b94ef959530, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3651969231085591530, guid: 19e21beb53333714c9b20b94ef959530, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3651969231085591530, guid: 19e21beb53333714c9b20b94ef959530, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3651969231085591530, guid: 19e21beb53333714c9b20b94ef959530, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3651969231085591530, guid: 19e21beb53333714c9b20b94ef959530, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3651969231085591530, guid: 19e21beb53333714c9b20b94ef959530, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3651969231085591530, guid: 19e21beb53333714c9b20b94ef959530, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 19e21beb53333714c9b20b94ef959530, type: 3} ---- !u!1001 &6430030730871762109 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 712406083227680011, guid: f8d060861033d81469f4155bfd11daa4, type: 3} - propertyPath: m_LocalPosition.x - value: 1.9759579 - objectReference: {fileID: 0} - - target: {fileID: 712406083227680011, guid: f8d060861033d81469f4155bfd11daa4, type: 3} - propertyPath: m_LocalPosition.y - value: -4.7833967 - objectReference: {fileID: 0} - - target: {fileID: 712406083227680011, guid: f8d060861033d81469f4155bfd11daa4, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 712406083227680011, guid: f8d060861033d81469f4155bfd11daa4, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 712406083227680011, guid: f8d060861033d81469f4155bfd11daa4, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 712406083227680011, guid: f8d060861033d81469f4155bfd11daa4, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 712406083227680011, guid: f8d060861033d81469f4155bfd11daa4, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 712406083227680011, guid: f8d060861033d81469f4155bfd11daa4, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 712406083227680011, guid: f8d060861033d81469f4155bfd11daa4, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 712406083227680011, guid: f8d060861033d81469f4155bfd11daa4, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1608946701812413035, guid: f8d060861033d81469f4155bfd11daa4, type: 3} - propertyPath: m_Name - value: PumpkinCrash - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: f8d060861033d81469f4155bfd11daa4, type: 3} ---- !u!1001 &6865183153239179842 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2378062497565836813, guid: 367711e787044c046bac7792f506cd94, type: 3} - propertyPath: m_LocalPosition.x - value: -1.1724701 - objectReference: {fileID: 0} - - target: {fileID: 2378062497565836813, guid: 367711e787044c046bac7792f506cd94, type: 3} - propertyPath: m_LocalPosition.y - value: -7.704368 - objectReference: {fileID: 0} - - target: {fileID: 2378062497565836813, guid: 367711e787044c046bac7792f506cd94, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2378062497565836813, guid: 367711e787044c046bac7792f506cd94, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2378062497565836813, guid: 367711e787044c046bac7792f506cd94, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2378062497565836813, guid: 367711e787044c046bac7792f506cd94, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2378062497565836813, guid: 367711e787044c046bac7792f506cd94, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2378062497565836813, guid: 367711e787044c046bac7792f506cd94, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2378062497565836813, guid: 367711e787044c046bac7792f506cd94, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2378062497565836813, guid: 367711e787044c046bac7792f506cd94, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7397881325997545212, guid: 367711e787044c046bac7792f506cd94, type: 3} - propertyPath: m_Name - value: WolfEnergyWave - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 367711e787044c046bac7792f506cd94, type: 3} ---- !u!1001 &7890886326164678664 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 714358794190965353, guid: ed2ec0150da22c7498660f890b5d9d0b, type: 3} + - target: {fileID: 7081223340028307245, guid: 6c84a8d8ff561714585abaed48ffb6b9, type: 3} propertyPath: m_Name value: TrollCrash objectReference: {fileID: 0} - - target: {fileID: 2659470572654768856, guid: ed2ec0150da22c7498660f890b5d9d0b, type: 3} + - target: {fileID: 9039985568881264830, guid: 6c84a8d8ff561714585abaed48ffb6b9, type: 3} propertyPath: m_LocalPosition.x - value: 0.30186653 + value: 9.6 objectReference: {fileID: 0} - - target: {fileID: 2659470572654768856, guid: ed2ec0150da22c7498660f890b5d9d0b, type: 3} + - target: {fileID: 9039985568881264830, guid: 6c84a8d8ff561714585abaed48ffb6b9, type: 3} propertyPath: m_LocalPosition.y - value: -6.6080666 + value: -6.82 objectReference: {fileID: 0} - - target: {fileID: 2659470572654768856, guid: ed2ec0150da22c7498660f890b5d9d0b, type: 3} + - target: {fileID: 9039985568881264830, guid: 6c84a8d8ff561714585abaed48ffb6b9, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2659470572654768856, guid: ed2ec0150da22c7498660f890b5d9d0b, type: 3} + - target: {fileID: 9039985568881264830, guid: 6c84a8d8ff561714585abaed48ffb6b9, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 2659470572654768856, guid: ed2ec0150da22c7498660f890b5d9d0b, type: 3} + - target: {fileID: 9039985568881264830, guid: 6c84a8d8ff561714585abaed48ffb6b9, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2659470572654768856, guid: ed2ec0150da22c7498660f890b5d9d0b, type: 3} + - target: {fileID: 9039985568881264830, guid: 6c84a8d8ff561714585abaed48ffb6b9, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2659470572654768856, guid: ed2ec0150da22c7498660f890b5d9d0b, type: 3} + - target: {fileID: 9039985568881264830, guid: 6c84a8d8ff561714585abaed48ffb6b9, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2659470572654768856, guid: ed2ec0150da22c7498660f890b5d9d0b, type: 3} + - target: {fileID: 9039985568881264830, guid: 6c84a8d8ff561714585abaed48ffb6b9, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2659470572654768856, guid: ed2ec0150da22c7498660f890b5d9d0b, type: 3} + - target: {fileID: 9039985568881264830, guid: 6c84a8d8ff561714585abaed48ffb6b9, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2659470572654768856, guid: ed2ec0150da22c7498660f890b5d9d0b, type: 3} + - target: {fileID: 9039985568881264830, guid: 6c84a8d8ff561714585abaed48ffb6b9, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} @@ -77513,8 +77171,8 @@ PrefabInstance: m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ed2ec0150da22c7498660f890b5d9d0b, type: 3} ---- !u!1001 &8327509820364830266 + m_SourcePrefab: {fileID: 100100000, guid: 6c84a8d8ff561714585abaed48ffb6b9, type: 3} +--- !u!1001 &1747941188231326941 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -77522,47 +77180,47 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 525770732599868594, guid: c6cd355df76fd7e4eb6d5b0f6c008941, type: 3} + - target: {fileID: 123878659603861660, guid: bdee23ac65f6d2b4bafefc94600190c8, type: 3} propertyPath: m_Name - value: FireImpact + value: WolfPunch objectReference: {fileID: 0} - - target: {fileID: 7823250880881222516, guid: c6cd355df76fd7e4eb6d5b0f6c008941, type: 3} + - target: {fileID: 1972504249886802456, guid: bdee23ac65f6d2b4bafefc94600190c8, type: 3} propertyPath: m_LocalPosition.x - value: -5.8601065 + value: 9.6 objectReference: {fileID: 0} - - target: {fileID: 7823250880881222516, guid: c6cd355df76fd7e4eb6d5b0f6c008941, type: 3} + - target: {fileID: 1972504249886802456, guid: bdee23ac65f6d2b4bafefc94600190c8, type: 3} propertyPath: m_LocalPosition.y - value: -8.271421 + value: -6.82 objectReference: {fileID: 0} - - target: {fileID: 7823250880881222516, guid: c6cd355df76fd7e4eb6d5b0f6c008941, type: 3} + - target: {fileID: 1972504249886802456, guid: bdee23ac65f6d2b4bafefc94600190c8, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7823250880881222516, guid: c6cd355df76fd7e4eb6d5b0f6c008941, type: 3} + - target: {fileID: 1972504249886802456, guid: bdee23ac65f6d2b4bafefc94600190c8, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 7823250880881222516, guid: c6cd355df76fd7e4eb6d5b0f6c008941, type: 3} + - target: {fileID: 1972504249886802456, guid: bdee23ac65f6d2b4bafefc94600190c8, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7823250880881222516, guid: c6cd355df76fd7e4eb6d5b0f6c008941, type: 3} + - target: {fileID: 1972504249886802456, guid: bdee23ac65f6d2b4bafefc94600190c8, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7823250880881222516, guid: c6cd355df76fd7e4eb6d5b0f6c008941, type: 3} + - target: {fileID: 1972504249886802456, guid: bdee23ac65f6d2b4bafefc94600190c8, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7823250880881222516, guid: c6cd355df76fd7e4eb6d5b0f6c008941, type: 3} + - target: {fileID: 1972504249886802456, guid: bdee23ac65f6d2b4bafefc94600190c8, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7823250880881222516, guid: c6cd355df76fd7e4eb6d5b0f6c008941, type: 3} + - target: {fileID: 1972504249886802456, guid: bdee23ac65f6d2b4bafefc94600190c8, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7823250880881222516, guid: c6cd355df76fd7e4eb6d5b0f6c008941, type: 3} + - target: {fileID: 1972504249886802456, guid: bdee23ac65f6d2b4bafefc94600190c8, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} @@ -77570,8 +77228,8 @@ PrefabInstance: m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: c6cd355df76fd7e4eb6d5b0f6c008941, type: 3} ---- !u!1001 &8606440973891989337 + m_SourcePrefab: {fileID: 100100000, guid: bdee23ac65f6d2b4bafefc94600190c8, type: 3} +--- !u!1001 &3167224815861714609 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -77579,47 +77237,104 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 1154300743199394583, guid: b3dc19b4ec6ac4d46895fb4d2913cfdd, type: 3} + - target: {fileID: 1270587839958746621, guid: a7b411323f70c6c4db9d2cab98824bd2, type: 3} + propertyPath: m_Name + value: DragonBreath + objectReference: {fileID: 0} + - target: {fileID: 1307078972646367573, guid: a7b411323f70c6c4db9d2cab98824bd2, type: 3} propertyPath: m_LocalPosition.x - value: 7.155012 + value: 9.6 objectReference: {fileID: 0} - - target: {fileID: 1154300743199394583, guid: b3dc19b4ec6ac4d46895fb4d2913cfdd, type: 3} + - target: {fileID: 1307078972646367573, guid: a7b411323f70c6c4db9d2cab98824bd2, type: 3} propertyPath: m_LocalPosition.y - value: -4.801734 + value: -6.82 objectReference: {fileID: 0} - - target: {fileID: 1154300743199394583, guid: b3dc19b4ec6ac4d46895fb4d2913cfdd, type: 3} + - target: {fileID: 1307078972646367573, guid: a7b411323f70c6c4db9d2cab98824bd2, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1154300743199394583, guid: b3dc19b4ec6ac4d46895fb4d2913cfdd, type: 3} + - target: {fileID: 1307078972646367573, guid: a7b411323f70c6c4db9d2cab98824bd2, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 1154300743199394583, guid: b3dc19b4ec6ac4d46895fb4d2913cfdd, type: 3} + - target: {fileID: 1307078972646367573, guid: a7b411323f70c6c4db9d2cab98824bd2, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1154300743199394583, guid: b3dc19b4ec6ac4d46895fb4d2913cfdd, type: 3} + - target: {fileID: 1307078972646367573, guid: a7b411323f70c6c4db9d2cab98824bd2, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1154300743199394583, guid: b3dc19b4ec6ac4d46895fb4d2913cfdd, type: 3} + - target: {fileID: 1307078972646367573, guid: a7b411323f70c6c4db9d2cab98824bd2, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1154300743199394583, guid: b3dc19b4ec6ac4d46895fb4d2913cfdd, type: 3} + - target: {fileID: 1307078972646367573, guid: a7b411323f70c6c4db9d2cab98824bd2, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1154300743199394583, guid: b3dc19b4ec6ac4d46895fb4d2913cfdd, type: 3} + - target: {fileID: 1307078972646367573, guid: a7b411323f70c6c4db9d2cab98824bd2, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1154300743199394583, guid: b3dc19b4ec6ac4d46895fb4d2913cfdd, type: 3} + - target: {fileID: 1307078972646367573, guid: a7b411323f70c6c4db9d2cab98824bd2, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3081056546688452950, guid: b3dc19b4ec6ac4d46895fb4d2913cfdd, type: 3} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a7b411323f70c6c4db9d2cab98824bd2, type: 3} +--- !u!1001 &3461225259843046068 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4794064920761420331, guid: e0e47ef64af779949aef813fbc15f1b5, type: 3} + propertyPath: m_LocalPosition.x + value: 9.6 + objectReference: {fileID: 0} + - target: {fileID: 4794064920761420331, guid: e0e47ef64af779949aef813fbc15f1b5, type: 3} + propertyPath: m_LocalPosition.y + value: -6.82 + objectReference: {fileID: 0} + - target: {fileID: 4794064920761420331, guid: e0e47ef64af779949aef813fbc15f1b5, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4794064920761420331, guid: e0e47ef64af779949aef813fbc15f1b5, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4794064920761420331, guid: e0e47ef64af779949aef813fbc15f1b5, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4794064920761420331, guid: e0e47ef64af779949aef813fbc15f1b5, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4794064920761420331, guid: e0e47ef64af779949aef813fbc15f1b5, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4794064920761420331, guid: e0e47ef64af779949aef813fbc15f1b5, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4794064920761420331, guid: e0e47ef64af779949aef813fbc15f1b5, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4794064920761420331, guid: e0e47ef64af779949aef813fbc15f1b5, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5091201270221039787, guid: e0e47ef64af779949aef813fbc15f1b5, type: 3} propertyPath: m_Name value: IceBlast objectReference: {fileID: 0} @@ -77627,7 +77342,349 @@ PrefabInstance: m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b3dc19b4ec6ac4d46895fb4d2913cfdd, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: e0e47ef64af779949aef813fbc15f1b5, type: 3} +--- !u!1001 &5384236376715975415 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3244724582992201572, guid: cc6826c2c28719f429e890d46db2808d, type: 3} + propertyPath: m_LocalPosition.x + value: 9.6 + objectReference: {fileID: 0} + - target: {fileID: 3244724582992201572, guid: cc6826c2c28719f429e890d46db2808d, type: 3} + propertyPath: m_LocalPosition.y + value: -6.82 + objectReference: {fileID: 0} + - target: {fileID: 3244724582992201572, guid: cc6826c2c28719f429e890d46db2808d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3244724582992201572, guid: cc6826c2c28719f429e890d46db2808d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3244724582992201572, guid: cc6826c2c28719f429e890d46db2808d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3244724582992201572, guid: cc6826c2c28719f429e890d46db2808d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3244724582992201572, guid: cc6826c2c28719f429e890d46db2808d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3244724582992201572, guid: cc6826c2c28719f429e890d46db2808d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3244724582992201572, guid: cc6826c2c28719f429e890d46db2808d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3244724582992201572, guid: cc6826c2c28719f429e890d46db2808d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5657264052368507626, guid: cc6826c2c28719f429e890d46db2808d, type: 3} + propertyPath: m_Name + value: TrollCharge + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cc6826c2c28719f429e890d46db2808d, type: 3} +--- !u!1001 &6994367162197659328 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 6470166121172466421, guid: b12ab214fbad9a449bc80119f185111e, type: 3} + propertyPath: m_Name + value: FireImpact + objectReference: {fileID: 0} + - target: {fileID: 7811880198066444325, guid: b12ab214fbad9a449bc80119f185111e, type: 3} + propertyPath: m_LocalPosition.x + value: 9.6 + objectReference: {fileID: 0} + - target: {fileID: 7811880198066444325, guid: b12ab214fbad9a449bc80119f185111e, type: 3} + propertyPath: m_LocalPosition.y + value: -6.82 + objectReference: {fileID: 0} + - target: {fileID: 7811880198066444325, guid: b12ab214fbad9a449bc80119f185111e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7811880198066444325, guid: b12ab214fbad9a449bc80119f185111e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7811880198066444325, guid: b12ab214fbad9a449bc80119f185111e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7811880198066444325, guid: b12ab214fbad9a449bc80119f185111e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7811880198066444325, guid: b12ab214fbad9a449bc80119f185111e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7811880198066444325, guid: b12ab214fbad9a449bc80119f185111e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7811880198066444325, guid: b12ab214fbad9a449bc80119f185111e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7811880198066444325, guid: b12ab214fbad9a449bc80119f185111e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b12ab214fbad9a449bc80119f185111e, type: 3} +--- !u!1001 &7455719542132033714 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 6602113715180894997, guid: 99c6c681f7d601445b6f970ee9b77109, type: 3} + propertyPath: m_Name + value: WolfEnergyWave + objectReference: {fileID: 0} + - target: {fileID: 8035266354307835703, guid: 99c6c681f7d601445b6f970ee9b77109, type: 3} + propertyPath: m_LocalPosition.x + value: 9.6 + objectReference: {fileID: 0} + - target: {fileID: 8035266354307835703, guid: 99c6c681f7d601445b6f970ee9b77109, type: 3} + propertyPath: m_LocalPosition.y + value: -6.82 + objectReference: {fileID: 0} + - target: {fileID: 8035266354307835703, guid: 99c6c681f7d601445b6f970ee9b77109, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8035266354307835703, guid: 99c6c681f7d601445b6f970ee9b77109, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8035266354307835703, guid: 99c6c681f7d601445b6f970ee9b77109, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8035266354307835703, guid: 99c6c681f7d601445b6f970ee9b77109, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8035266354307835703, guid: 99c6c681f7d601445b6f970ee9b77109, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8035266354307835703, guid: 99c6c681f7d601445b6f970ee9b77109, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8035266354307835703, guid: 99c6c681f7d601445b6f970ee9b77109, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8035266354307835703, guid: 99c6c681f7d601445b6f970ee9b77109, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 99c6c681f7d601445b6f970ee9b77109, type: 3} +--- !u!1001 &7676365849759166213 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3715909542404085769, guid: 358f073558c5daa4185d8950938ae415, type: 3} + propertyPath: m_Name + value: DragonShockWave + objectReference: {fileID: 0} + - target: {fileID: 5897562606958307656, guid: 358f073558c5daa4185d8950938ae415, type: 3} + propertyPath: m_LocalPosition.x + value: 9.6 + objectReference: {fileID: 0} + - target: {fileID: 5897562606958307656, guid: 358f073558c5daa4185d8950938ae415, type: 3} + propertyPath: m_LocalPosition.y + value: -6.82 + objectReference: {fileID: 0} + - target: {fileID: 5897562606958307656, guid: 358f073558c5daa4185d8950938ae415, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5897562606958307656, guid: 358f073558c5daa4185d8950938ae415, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5897562606958307656, guid: 358f073558c5daa4185d8950938ae415, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5897562606958307656, guid: 358f073558c5daa4185d8950938ae415, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5897562606958307656, guid: 358f073558c5daa4185d8950938ae415, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5897562606958307656, guid: 358f073558c5daa4185d8950938ae415, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5897562606958307656, guid: 358f073558c5daa4185d8950938ae415, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5897562606958307656, guid: 358f073558c5daa4185d8950938ae415, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 358f073558c5daa4185d8950938ae415, type: 3} +--- !u!1001 &9065059008304987233 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 5815932945680858224, guid: 4f642f085df0b924f895a1d23e67ad3f, type: 3} + propertyPath: m_LocalPosition.x + value: 9.6 + objectReference: {fileID: 0} + - target: {fileID: 5815932945680858224, guid: 4f642f085df0b924f895a1d23e67ad3f, type: 3} + propertyPath: m_LocalPosition.y + value: -6.82 + objectReference: {fileID: 0} + - target: {fileID: 5815932945680858224, guid: 4f642f085df0b924f895a1d23e67ad3f, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5815932945680858224, guid: 4f642f085df0b924f895a1d23e67ad3f, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5815932945680858224, guid: 4f642f085df0b924f895a1d23e67ad3f, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5815932945680858224, guid: 4f642f085df0b924f895a1d23e67ad3f, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5815932945680858224, guid: 4f642f085df0b924f895a1d23e67ad3f, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5815932945680858224, guid: 4f642f085df0b924f895a1d23e67ad3f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5815932945680858224, guid: 4f642f085df0b924f895a1d23e67ad3f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5815932945680858224, guid: 4f642f085df0b924f895a1d23e67ad3f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6551207428356273061, guid: 4f642f085df0b924f895a1d23e67ad3f, type: 3} + propertyPath: m_Name + value: PumpkinCrash + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4f642f085df0b924f895a1d23e67ad3f, type: 3} +--- !u!1001 &9115962474533691980 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3492436235769325888, guid: 82350566434da384cb94c1c2624dbeae, type: 3} + propertyPath: m_LocalPosition.x + value: 9.6 + objectReference: {fileID: 0} + - target: {fileID: 3492436235769325888, guid: 82350566434da384cb94c1c2624dbeae, type: 3} + propertyPath: m_LocalPosition.y + value: -3.29 + objectReference: {fileID: 0} + - target: {fileID: 3492436235769325888, guid: 82350566434da384cb94c1c2624dbeae, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3492436235769325888, guid: 82350566434da384cb94c1c2624dbeae, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3492436235769325888, guid: 82350566434da384cb94c1c2624dbeae, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3492436235769325888, guid: 82350566434da384cb94c1c2624dbeae, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3492436235769325888, guid: 82350566434da384cb94c1c2624dbeae, type: 3} + propertyPath: m_LocalRotation.z + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3492436235769325888, guid: 82350566434da384cb94c1c2624dbeae, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3492436235769325888, guid: 82350566434da384cb94c1c2624dbeae, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3492436235769325888, guid: 82350566434da384cb94c1c2624dbeae, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 5413697641276301969, guid: 82350566434da384cb94c1c2624dbeae, type: 3} + propertyPath: m_Name + value: DropObject + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 82350566434da384cb94c1c2624dbeae, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -77646,18 +77703,17 @@ SceneRoots: - {fileID: 2026225658} - {fileID: 131450193} - {fileID: 1494770074} - - {fileID: 2131259786} - {fileID: 431020306} - {fileID: 1932526043} - - {fileID: 3241122426496265767} - - {fileID: 5448443593561372940} - - {fileID: 8606440973891989337} - - {fileID: 6430030730871762109} - - {fileID: 3102516619230165340} - - {fileID: 7890886326164678664} - - {fileID: 656779510139692607} - - {fileID: 6865183153239179842} - - {fileID: 5291620879968733237} - - {fileID: 2698727206670674272} - - {fileID: 8327509820364830266} - - {fileID: 324269278} + - {fileID: 3167224815861714609} + - {fileID: 3461225259843046068} + - {fileID: 9065059008304987233} + - {fileID: 5384236376715975415} + - {fileID: 1219945226467407874} + - {fileID: 672402718813478257} + - {fileID: 7455719542132033714} + - {fileID: 1747941188231326941} + - {fileID: 7676365849759166213} + - {fileID: 6994367162197659328} + - {fileID: 9115962474533691980} + - {fileID: 1043803241} diff --git a/Gameton-06/Assets/Gameton/Scripts/Monster/Eyesight.cs b/Gameton-06/Assets/Gameton/Scripts/Monster/Eyesight.cs index 230fc82e..821aa536 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Monster/Eyesight.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Monster/Eyesight.cs @@ -9,19 +9,13 @@ namespace TON [SerializeField] private MonsterBase _monsterBase; // private bool _isDetect; - private GameObject skill; + private GameObject skillPrefab; private void OnTriggerEnter2D(Collider2D other) { if (other.CompareTag("Player")) { - skill = _monsterBase.smallFirePrefab; - GameObject newSkill = Instantiate(skill); - newSkill.transform.position = other.transform.position; - // newSkill.GetComponent().Direction = new Vector2(1, 0); - // _monsterBase.SetTransition(new AttackState()); - - + _monsterBase.SetTransition(new MonsterSkillState()); // 플레이어 감지하면 따라가기 // _monsterBase.SetTransition(new ChasingState()); Debug.Log("감지됨"); diff --git a/Gameton-06/Assets/Gameton/Scripts/Monster/MonsterBase.cs b/Gameton-06/Assets/Gameton/Scripts/Monster/MonsterBase.cs index 8b5c49b9..1ff0d415 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Monster/MonsterBase.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Monster/MonsterBase.cs @@ -22,7 +22,7 @@ namespace TON public int level; public float currentHP = 100; // 몬스터의 현재 체력 public int attackPower; // 공격력 - public int defensePower; + public float defencePower; // 몬스터의 방어력 public int monsterSkillID; public float patrolRange; public float detectionRange; @@ -46,8 +46,6 @@ namespace TON [SerializeField] private Collider2D _collider; // 몬스터의 콜라이더 - public float defencePower; // 몬스터의 방어력 - // 애니메이션 관련 선언 private string currentAnimationState; // 현재 애니메이션 상태 @@ -70,7 +68,18 @@ namespace TON public string animationName; // 스킬 애니메이션 이름 public GameObject smallFirePrefab; - + public GameObject DragonBreathPrefab; + public GameObject IceBlastPrefab; + public GameObject PumpkinCrashPrefab; + public GameObject TrollChargePrefab; + public GameObject TrollCrashPrefab; + public GameObject TrollThundePrefab; + public GameObject WolfEnergyWavePrefab; + public GameObject WolfPunchPrefab; + public GameObject DragonShockWavePrefab; + public GameObject FireImpactPrefab; + public GameObject DropObjectPrefab; + // 첫 번째 프레임 전에 호출됩니다. private void Start() { @@ -105,7 +114,6 @@ namespace TON monsterName = monsterData.name; level = monsterData.level; currentHP = monsterData.hp; - attackPower = monsterData.attackPower; defencePower = monsterData.defencePower; monsterSkillID = monsterData.monsterSkillID;; patrolRange = monsterData.patrolRange; @@ -243,5 +251,15 @@ namespace TON { _stateMachine.SetTransition(state); } + + public void MonsterSkillLaunch() + { + var target = GameObject.FindGameObjectWithTag("Player"); + _spriteRenderer.flipX = target.transform.position.x < transform.position.x; + + GameObject newSkill = Instantiate(smallFirePrefab); + newSkill.transform.position = transform.position + new Vector3(0, 1f, 0); + newSkill.GetComponent().Direction = new Vector2(0, 1); + } } } diff --git a/Gameton-06/Assets/Gameton/Scripts/Monster/MonsterSkill.cs b/Gameton-06/Assets/Gameton/Scripts/Monster/MonsterSkill.cs index cf318183..44391c5d 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Monster/MonsterSkill.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Monster/MonsterSkill.cs @@ -7,7 +7,7 @@ namespace TON { public class MonsterSkill : MonoBehaviour { - public float speed = 3; + public float speed = 5f; public float damage = 1; Vector2 direction; diff --git a/Gameton-06/Assets/Gameton/Scripts/Monster/StateMachine.cs b/Gameton-06/Assets/Gameton/Scripts/Monster/StateMachine.cs index 65489da8..63abca5a 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Monster/StateMachine.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Monster/StateMachine.cs @@ -203,24 +203,48 @@ namespace TON public class MonsterSkillState : State { private const string AniAttack = "Attack"; // 공격 애니메이션 - public GameObject smallFirePrefab; + private const string AniIdle = "Idle"; // 대기 애니메이션 private MonsterBase _monsterBase; + private float _skillAttackAnimationDuration = 0.5f; // 공격 애니메이션 지속 시간 + private float _skillAttackDelayTime = 2f; // 공격 딜레이 시간 + private float _lastSkillAttackTime; // 마지막 공격 시간 + + private bool _isSkillAttacking; public void Enter(MonsterBase monsterBase) { - smallFirePrefab = _monsterBase.smallFirePrefab; - + _monsterBase = monsterBase; + _lastSkillAttackTime = -_skillAttackDelayTime; // 처음 진입시 바로 공격하도록 설정 + SkillAttack(); } public void Update() + { + // 현재 공격 중이 아니고, 쿨다운이 지났다면 공격 + if (!_isSkillAttacking && Time.time >= _lastSkillAttackTime + _skillAttackDelayTime) + { + SkillAttack(); + } + + // 공격 애니메이션 종료 체크 + if (_isSkillAttacking && Time.time >= _lastSkillAttackTime + _skillAttackAnimationDuration) + { + _isSkillAttacking = false; + _monsterBase.ChangeAnimationState(AniIdle); + } + } + + private void SkillAttack() { _monsterBase.ChangeAnimationState(AniAttack); - + _monsterBase.MonsterSkillLaunch(); + _lastSkillAttackTime = Time.time; + _isSkillAttacking = true; } public void Exit() { - + _isSkillAttacking = false; } public void CheckTransition()