From d9aaccf1006a65d6282474df8b0efa61a4bc00b2 Mon Sep 17 00:00:00 2001 From: Mingu Kim Date: Mon, 17 Feb 2025 18:47:15 +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=A0=88=EC=9D=B4=EC=96=B4=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=EB=B0=8F=20=EB=AA=AC=EC=8A=A4=ED=84=B0=20=EA=B2=B9?= =?UTF-8?q?=EC=B9=A0=20=EC=88=98=20=EC=9E=88=EA=B2=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Animation/Monster/Animation/Attack.anim | 2 +- .../Monster Animator Controller.controller | 150 +++++++++--------- .../MonsterPrefabs/BlueDragon.prefab | 27 +++- .../MonsterPrefabs/Boss/BlackWerewolf.prefab | 4 +- .../MonsterPrefabs/Boss/BlueTroll.prefab | 4 +- .../MonsterPrefabs/Boss/RedRex.prefab | 4 +- .../MonsterPrefabs/BrownWerewolf.prefab | 27 +++- .../MonsterPrefabs/GreenDragon.prefab | 27 +++- .../MonsterPrefabs/LastBoss/RedDragon.prefab | 2 +- .../MonsterPrefabs/Mid Boss/BlueRex.prefab | 10 +- .../Mid Boss/GreenPumpkin.prefab | 10 +- .../MonsterPrefabs/Mid Boss/GreenTroll.prefab | 10 +- .../MonsterPrefabs/Nomal/BlackTroll.prefab | 33 +++- .../{GrrnOgre.prefab => GreenOgre.prefab} | 35 ++-- ...Ogre.prefab.meta => GreenOgre.prefab.meta} | 0 .../MonsterPrefabs/Nomal/GreenRex.prefab | 33 +++- .../MonsterPrefabs/Nomal/PurplePumpkin.prefab | 33 +++- .../MonsterPrefabs/Nomal/RedOgre.prefab | 33 +++- .../MonsterPrefabs/Nomal/YellowPumpkin.prefab | 33 +++- .../MonsterPrefabs/PurpleOgre.prefab | 27 +++- .../MonsterPrefabs/RedWerevolf.prefab | 27 +++- .../Personal Scenes/dev_mingu/Ingame.unity | 75 ++++++++- .../ProjectSettings/Physics2DSettings.asset | 2 +- 23 files changed, 431 insertions(+), 177 deletions(-) rename Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/{GrrnOgre.prefab => GreenOgre.prefab} (96%) rename Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/{GrrnOgre.prefab.meta => GreenOgre.prefab.meta} (100%) diff --git a/Gameton-06/Assets/Gameton/Resources/Animation/Monster/Animation/Attack.anim b/Gameton-06/Assets/Gameton/Resources/Animation/Monster/Animation/Attack.anim index aef47564..e3810d2e 100644 --- a/Gameton-06/Assets/Gameton/Resources/Animation/Monster/Animation/Attack.anim +++ b/Gameton-06/Assets/Gameton/Resources/Animation/Monster/Animation/Attack.anim @@ -211,7 +211,7 @@ AnimationClip: m_HasMotionFloatCurves: 0 m_Events: - time: 0.5 - functionName: + functionName: FinishAttack data: objectReferenceParameter: {fileID: 0} floatParameter: 0 diff --git a/Gameton-06/Assets/Gameton/Resources/Animation/Monster/Animation/Monster Animator Controller.controller b/Gameton-06/Assets/Gameton/Resources/Animation/Monster/Animation/Monster Animator Controller.controller index fc8294fa..2f59d384 100644 --- a/Gameton-06/Assets/Gameton/Resources/Animation/Monster/Animation/Monster Animator Controller.controller +++ b/Gameton-06/Assets/Gameton/Resources/Animation/Monster/Animation/Monster Animator Controller.controller @@ -14,25 +14,25 @@ AnimatorStateMachine: m_Position: {x: 320, y: 110, z: 0} - serializedVersion: 1 m_State: {fileID: 1882972568344343729} - m_Position: {x: 570, y: 110, z: 0} - - serializedVersion: 1 - m_State: {fileID: -6655501467506089146} - m_Position: {x: 460, y: 20, z: 0} + m_Position: {x: 590, y: 100, z: 0} - serializedVersion: 1 m_State: {fileID: -5330250526715983179} m_Position: {x: 460, y: 180, z: 0} - - serializedVersion: 1 - m_State: {fileID: -3931975335905909852} - m_Position: {x: 495, y: 245, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1039420698878245136} - m_Position: {x: 530, y: 310, z: 0} - - serializedVersion: 1 - m_State: {fileID: 9040470144144161811} - m_Position: {x: 565, y: 375, z: 0} - serializedVersion: 1 m_State: {fileID: 3886688288382943202} - m_Position: {x: 600, y: 440, z: 0} + m_Position: {x: 470, y: 380, z: 0} + - serializedVersion: 1 + m_State: {fileID: -3064775625028682800} + m_Position: {x: 580, y: 10, z: 0} + - serializedVersion: 1 + m_State: {fileID: -5037028365499894863} + m_Position: {x: 470, y: 250, z: 0} + - serializedVersion: 1 + m_State: {fileID: -5450091040760197226} + m_Position: {x: 470, y: 320, z: 0} + - serializedVersion: 1 + m_State: {fileID: -711064010028435971} + m_Position: {x: 470, y: 450, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -63,20 +63,20 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 682dca0c6ed860c4fb1082dc83ea98eb, type: 2} + m_Motion: {fileID: 7400000, guid: 829bc23d5650e3c4999a933871d79083, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1102 &-6655501467506089146 +--- !u!1102 &-5450091040760197226 AnimatorState: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Attack + m_Name: Fire m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -89,7 +89,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: c7fd992b7f6714442b9bab7e0f861525, type: 2} + m_Motion: {fileID: 7400000, guid: 8f3d070c58b364241ab00b6b252dfbcc, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -115,13 +115,13 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: bb098cbd037fddc4991e0829f5f0628f, type: 2} + m_Motion: {fileID: 7400000, guid: 4b5def9660f55544ea75497214db8a79, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1102 &-3931975335905909852 +--- !u!1102 &-5037028365499894863 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 @@ -141,7 +141,59 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: c1b7ac35b6d3c304a935c2c443ba8b9e, type: 2} + m_Motion: {fileID: 7400000, guid: 5eaf13aa303eafd4abae342911785739, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-3064775625028682800 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: b8d19a3f74fe3974c91eeb2c565634ec, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-711064010028435971 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Ready + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: f5c1e198e724e8b489b5c001bfbbd274, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -187,32 +239,6 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} ---- !u!1102 &1039420698878245136 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Fire - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: e3745a07c505b7d41ba5f3c6ca863939, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: --- !u!1102 &1882972568344343729 AnimatorState: serializedVersion: 6 @@ -233,7 +259,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 817a5c7a90bf1984fbed967e11819e0b, type: 2} + m_Motion: {fileID: 7400000, guid: 8b18c121789633240be54cc0fa675934, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -265,29 +291,3 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1102 &9040470144144161811 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Ready - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: e21a5801207f7ab4a899c80a067ed591, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/BlueDragon.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/BlueDragon.prefab index 3000a43e..e146407b 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/BlueDragon.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/BlueDragon.prefab @@ -178,7 +178,7 @@ GameObject: - component: {fileID: 7452679976185027198} - component: {fileID: 5853913574187894824} - component: {fileID: 5857685127154262763} - m_Layer: 0 + m_Layer: 3 m_Name: BlueDragon m_TagString: Monster m_Icon: {fileID: 0} @@ -390,12 +390,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 @@ -404,5 +404,22 @@ MonoBehaviour: _spriteRenderer: {fileID: 1269702193996304710} _target: {fileID: 0} _collider: {fileID: 4617053352677362279} - defencePower: 10 _hpBarImage: {fileID: 0} + skillId: 0 + skillName: + damage: 0 + cooldown: 0 + 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} diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Boss/BlackWerewolf.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Boss/BlackWerewolf.prefab index c07a40b4..b82af2fc 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Boss/BlackWerewolf.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Boss/BlackWerewolf.prefab @@ -16,7 +16,7 @@ GameObject: - component: {fileID: 2074022989821271346} - component: {fileID: 9136438650239437877} - component: {fileID: 9005905797466949371} - m_Layer: 0 + m_Layer: 3 m_Name: BlackWerewolf m_TagString: Monster m_Icon: {fileID: 0} @@ -239,7 +239,7 @@ MonoBehaviour: chaseRange: 0 speed: 3 attackRange: 0 - _spriteRenderer: {fileID: 0} + _spriteRenderer: {fileID: 592092508951316932} _target: {fileID: 0} _collider: {fileID: 0} _hpBarImage: {fileID: 0} diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Boss/BlueTroll.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Boss/BlueTroll.prefab index 5322e73d..eed99214 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Boss/BlueTroll.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Boss/BlueTroll.prefab @@ -97,7 +97,7 @@ GameObject: - component: {fileID: 2940668072414840122} - component: {fileID: 4782963675616737757} - component: {fileID: 8680259026051106041} - m_Layer: 0 + m_Layer: 3 m_Name: BlueTroll m_TagString: Monster m_Icon: {fileID: 0} @@ -320,7 +320,7 @@ MonoBehaviour: chaseRange: 0 speed: 3 attackRange: 0 - _spriteRenderer: {fileID: 0} + _spriteRenderer: {fileID: 4721946587208924001} _target: {fileID: 0} _collider: {fileID: 0} _hpBarImage: {fileID: 0} diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Boss/RedRex.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Boss/RedRex.prefab index c262314e..23bc09f4 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Boss/RedRex.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Boss/RedRex.prefab @@ -97,7 +97,7 @@ GameObject: - component: {fileID: 5224079812717155775} - component: {fileID: 7645539626140565081} - component: {fileID: 705413505888271155} - m_Layer: 0 + m_Layer: 3 m_Name: RedRex m_TagString: Monster m_Icon: {fileID: 0} @@ -320,7 +320,7 @@ MonoBehaviour: chaseRange: 0 speed: 3 attackRange: 0 - _spriteRenderer: {fileID: 0} + _spriteRenderer: {fileID: 7017725869417428001} _target: {fileID: 0} _collider: {fileID: 0} _hpBarImage: {fileID: 0} diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/BrownWerewolf.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/BrownWerewolf.prefab index 43614ac1..a92e1608 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/BrownWerewolf.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/BrownWerewolf.prefab @@ -16,7 +16,7 @@ GameObject: - component: {fileID: 6990484051444959619} - component: {fileID: 4461708158762166693} - component: {fileID: 2162079424076978325} - m_Layer: 0 + m_Layer: 3 m_Name: BrownWerewolf m_TagString: Monster m_Icon: {fileID: 0} @@ -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 @@ -242,8 +242,25 @@ MonoBehaviour: _spriteRenderer: {fileID: 2421631177632172315} _target: {fileID: 0} _collider: {fileID: 2538243315479772474} - defencePower: 10 _hpBarImage: {fileID: 0} + skillId: 0 + skillName: + damage: 0 + cooldown: 0 + 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!1 &3744309987831766794 GameObject: m_ObjectHideFlags: 0 diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/GreenDragon.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/GreenDragon.prefab index 7789439d..2a0c5402 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/GreenDragon.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/GreenDragon.prefab @@ -178,7 +178,7 @@ GameObject: - component: {fileID: 6629833030535884371} - component: {fileID: 6774294030256895352} - component: {fileID: 1035882020918319644} - m_Layer: 0 + m_Layer: 3 m_Name: GreenDragon m_TagString: Monster m_Icon: {fileID: 0} @@ -390,12 +390,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 @@ -404,5 +404,22 @@ MonoBehaviour: _spriteRenderer: {fileID: 7440930953996616536} _target: {fileID: 0} _collider: {fileID: 2019777489571142283} - defencePower: 10 _hpBarImage: {fileID: 0} + skillId: 0 + skillName: + damage: 0 + cooldown: 0 + 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} diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/LastBoss/RedDragon.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/LastBoss/RedDragon.prefab index e7a6c5f7..f83e46de 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/LastBoss/RedDragon.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/LastBoss/RedDragon.prefab @@ -16,7 +16,7 @@ GameObject: - component: {fileID: 6411907760444170154} - component: {fileID: 4409121389344890060} - component: {fileID: 172749484477612116} - m_Layer: 0 + m_Layer: 3 m_Name: RedDragon m_TagString: Monster m_Icon: {fileID: 0} 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 c77e6f4c..2b7ef78e 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Mid Boss/BlueRex.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Mid Boss/BlueRex.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 6831063563826723751} - component: {fileID: 9166319650603419144} - component: {fileID: 1662443761188053708} - m_Layer: 5 + m_Layer: 3 m_Name: HpBackground m_TagString: Untagged m_Icon: {fileID: 0} @@ -87,7 +87,7 @@ GameObject: - component: {fileID: 4185321231110066480} - component: {fileID: 2701620085337800645} - component: {fileID: 8314632780009235448} - m_Layer: 5 + m_Layer: 3 m_Name: Hp m_TagString: Untagged m_Icon: {fileID: 0} @@ -325,7 +325,7 @@ GameObject: - component: {fileID: 1078841307966053901} - component: {fileID: 4727011638148776530} - component: {fileID: 922606569909556139} - m_Layer: 5 + m_Layer: 3 m_Name: Canvas m_TagString: Untagged m_Icon: {fileID: 0} @@ -431,7 +431,7 @@ GameObject: - component: {fileID: 5073062528371734196} - component: {fileID: 6967364099735454947} - component: {fileID: 1587851352149786247} - m_Layer: 0 + m_Layer: 3 m_Name: BlueRex m_TagString: Monster m_Icon: {fileID: 0} @@ -655,7 +655,7 @@ MonoBehaviour: chaseRange: 0 speed: 3 attackRange: 0 - _spriteRenderer: {fileID: 0} + _spriteRenderer: {fileID: 5120407950894233432} _target: {fileID: 0} _collider: {fileID: 0} _hpBarImage: {fileID: 0} 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 35f046ed..dba1f0d4 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Mid Boss/GreenPumpkin.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Mid Boss/GreenPumpkin.prefab @@ -16,7 +16,7 @@ GameObject: - component: {fileID: 6477984660058860789} - component: {fileID: 3731684883505981096} - component: {fileID: 4429443442002592585} - m_Layer: 0 + m_Layer: 3 m_Name: GreenPumpkin m_TagString: Monster m_Icon: {fileID: 0} @@ -240,7 +240,7 @@ MonoBehaviour: chaseRange: 0 speed: 3 attackRange: 0 - _spriteRenderer: {fileID: 0} + _spriteRenderer: {fileID: 453936598381272866} _target: {fileID: 0} _collider: {fileID: 0} _hpBarImage: {fileID: 0} @@ -274,7 +274,7 @@ GameObject: - component: {fileID: 5590939323014277300} - component: {fileID: 5892890528505009901} - component: {fileID: 5629801542361907476} - m_Layer: 5 + m_Layer: 3 m_Name: Canvas m_TagString: Untagged m_Icon: {fileID: 0} @@ -456,7 +456,7 @@ GameObject: - component: {fileID: 2486255157273801601} - component: {fileID: 2340023822829473254} - component: {fileID: 8109042734118955852} - m_Layer: 5 + m_Layer: 3 m_Name: HpBackground m_TagString: Untagged m_Icon: {fileID: 0} @@ -532,7 +532,7 @@ GameObject: - component: {fileID: 3137452140856320815} - component: {fileID: 187129090421193227} - component: {fileID: 7566208539270634048} - m_Layer: 5 + m_Layer: 3 m_Name: Hp m_TagString: Untagged m_Icon: {fileID: 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 c15c8776..8e7df237 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Mid Boss/GreenTroll.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Mid Boss/GreenTroll.prefab @@ -174,7 +174,7 @@ GameObject: - component: {fileID: 6776481322997000637} - component: {fileID: 5241830952633454587} - component: {fileID: 3022049668569152875} - m_Layer: 5 + m_Layer: 3 m_Name: Canvas m_TagString: Untagged m_Icon: {fileID: 0} @@ -275,7 +275,7 @@ GameObject: - component: {fileID: 2381561800476441977} - component: {fileID: 6675732517473225864} - component: {fileID: 3336782630288437466} - m_Layer: 5 + m_Layer: 3 m_Name: HpBackground m_TagString: Untagged m_Icon: {fileID: 0} @@ -356,7 +356,7 @@ GameObject: - component: {fileID: 7933855234752634587} - component: {fileID: 3833828277223620329} - component: {fileID: 5393490782033978316} - m_Layer: 0 + m_Layer: 3 m_Name: GreenTroll m_TagString: Monster m_Icon: {fileID: 0} @@ -580,7 +580,7 @@ MonoBehaviour: chaseRange: 0 speed: 3 attackRange: 0 - _spriteRenderer: {fileID: 0} + _spriteRenderer: {fileID: 6858484445723671200} _target: {fileID: 0} _collider: {fileID: 0} _hpBarImage: {fileID: 0} @@ -613,7 +613,7 @@ GameObject: - component: {fileID: 7840389420112140800} - component: {fileID: 4519886962962236340} - component: {fileID: 5573945809377501791} - m_Layer: 5 + m_Layer: 3 m_Name: Hp m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/BlackTroll.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/BlackTroll.prefab index 787530d2..b880bc92 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/BlackTroll.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/BlackTroll.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 8588915526847560493} - component: {fileID: 7341249599799714319} - component: {fileID: 8316546459892616994} - m_Layer: 5 + m_Layer: 3 m_Name: Hp m_TagString: Untagged m_Icon: {fileID: 0} @@ -167,7 +167,7 @@ GameObject: - component: {fileID: 3806437718625476131} - component: {fileID: 3280851039149585887} - component: {fileID: 32222485337476293} - m_Layer: 5 + m_Layer: 3 m_Name: HpBackground m_TagString: Untagged m_Icon: {fileID: 0} @@ -248,7 +248,7 @@ GameObject: - component: {fileID: 3755389356996766134} - component: {fileID: 4593226769141903835} - component: {fileID: 4707985683249688333} - m_Layer: 0 + m_Layer: 3 m_Name: BlackTroll m_TagString: Monster m_Icon: {fileID: 0} @@ -461,12 +461,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 @@ -475,8 +475,25 @@ MonoBehaviour: _spriteRenderer: {fileID: 5636364246843047355} _target: {fileID: 0} _collider: {fileID: 6768085599137241520} - defencePower: 10 _hpBarImage: {fileID: 0} + skillId: 0 + skillName: + damage: 0 + cooldown: 0 + 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!1 &5517639527144806737 GameObject: m_ObjectHideFlags: 0 @@ -570,7 +587,7 @@ GameObject: - component: {fileID: 4511828911534615108} - component: {fileID: 6868299405778376069} - component: {fileID: 2547895694325741063} - m_Layer: 5 + m_Layer: 3 m_Name: Canvas m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/GrrnOgre.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/GreenOgre.prefab similarity index 96% rename from Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/GrrnOgre.prefab rename to Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/GreenOgre.prefab index bce3bd00..9de28496 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/GrrnOgre.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/GreenOgre.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 945956006363383888} - component: {fileID: 5486437844000215696} - component: {fileID: 2153691115770090508} - m_Layer: 5 + m_Layer: 3 m_Name: Hp m_TagString: Untagged m_Icon: {fileID: 0} @@ -86,7 +86,7 @@ GameObject: - component: {fileID: 3192540896488694481} - component: {fileID: 8125000676009494833} - component: {fileID: 5202196925012886135} - m_Layer: 5 + m_Layer: 3 m_Name: HpBackground m_TagString: Untagged m_Icon: {fileID: 0} @@ -163,7 +163,7 @@ GameObject: - component: {fileID: 7250668324955394926} - component: {fileID: 3867776280677888610} - component: {fileID: 7536972871122744698} - m_Layer: 5 + m_Layer: 3 m_Name: Canvas m_TagString: Untagged m_Icon: {fileID: 0} @@ -350,8 +350,8 @@ GameObject: - component: {fileID: 220072405918019578} - component: {fileID: 3599791498772529637} - component: {fileID: 4682527902446353803} - m_Layer: 0 - m_Name: GrrnOgre + m_Layer: 3 + m_Name: GreenOgre m_TagString: Monster m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -563,12 +563,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 @@ -577,8 +577,25 @@ MonoBehaviour: _spriteRenderer: {fileID: 4428022325186423475} _target: {fileID: 0} _collider: {fileID: 898726376241471782} - defencePower: 10 _hpBarImage: {fileID: 0} + skillId: 0 + skillName: + damage: 0 + cooldown: 0 + 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!1 &7570151098365513060 GameObject: m_ObjectHideFlags: 0 diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/GrrnOgre.prefab.meta b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/GreenOgre.prefab.meta similarity index 100% rename from Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/GrrnOgre.prefab.meta rename to Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/GreenOgre.prefab.meta diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/GreenRex.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/GreenRex.prefab index 210ff51f..916035f6 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/GreenRex.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/GreenRex.prefab @@ -16,7 +16,7 @@ GameObject: - component: {fileID: 7017750443104886884} - component: {fileID: 7864811774615096756} - component: {fileID: 8281494938760581564} - m_Layer: 0 + m_Layer: 3 m_Name: GreenRex m_TagString: Monster m_Icon: {fileID: 0} @@ -229,12 +229,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 @@ -243,8 +243,25 @@ MonoBehaviour: _spriteRenderer: {fileID: 1884691218758219349} _target: {fileID: 0} _collider: {fileID: 3873838448514641420} - defencePower: 10 _hpBarImage: {fileID: 0} + skillId: 0 + skillName: + damage: 0 + cooldown: 0 + 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!1 &1425971833131969348 GameObject: m_ObjectHideFlags: 0 @@ -256,7 +273,7 @@ GameObject: - component: {fileID: 1068543319221755834} - component: {fileID: 744092064998113487} - component: {fileID: 4741886498864672425} - m_Layer: 5 + m_Layer: 3 m_Name: Hp m_TagString: Untagged m_Icon: {fileID: 0} @@ -332,7 +349,7 @@ GameObject: - component: {fileID: 3185805400235774428} - component: {fileID: 8244547504280344857} - component: {fileID: 1213701132677157000} - m_Layer: 5 + m_Layer: 3 m_Name: Canvas m_TagString: Untagged m_Icon: {fileID: 0} @@ -514,7 +531,7 @@ GameObject: - component: {fileID: 6904507844356195439} - component: {fileID: 1073425049191849785} - component: {fileID: 5512390976772954943} - m_Layer: 5 + m_Layer: 3 m_Name: HpBackground m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/PurplePumpkin.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/PurplePumpkin.prefab index 3d3a0e63..1d045d0d 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/PurplePumpkin.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/PurplePumpkin.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 8055676915344699427} - component: {fileID: 2102790910861955124} - component: {fileID: 953440259044723505} - m_Layer: 5 + m_Layer: 3 m_Name: Canvas m_TagString: Untagged m_Icon: {fileID: 0} @@ -194,7 +194,7 @@ GameObject: - component: {fileID: 292558851331411849} - component: {fileID: 2369066958554178277} - component: {fileID: 3335226426232661380} - m_Layer: 5 + m_Layer: 3 m_Name: Hp m_TagString: Untagged m_Icon: {fileID: 0} @@ -350,7 +350,7 @@ GameObject: - component: {fileID: 8390153746125434526} - component: {fileID: 7745573016426894216} - component: {fileID: 7719164324857705517} - m_Layer: 5 + m_Layer: 3 m_Name: HpBackground m_TagString: Untagged m_Icon: {fileID: 0} @@ -431,7 +431,7 @@ GameObject: - component: {fileID: 988547533290132143} - component: {fileID: 3031469019251174195} - component: {fileID: 3877897766620331718} - m_Layer: 0 + m_Layer: 3 m_Name: PurplePumpkin m_TagString: Monster m_Icon: {fileID: 0} @@ -644,12 +644,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 @@ -658,5 +658,22 @@ MonoBehaviour: _spriteRenderer: {fileID: 6907519990020749312} _target: {fileID: 0} _collider: {fileID: 8798441981702176517} - defencePower: 10 _hpBarImage: {fileID: 0} + skillId: 0 + skillName: + damage: 0 + cooldown: 0 + 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} diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/RedOgre.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/RedOgre.prefab index d8a92275..00d9acc7 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/RedOgre.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/RedOgre.prefab @@ -97,7 +97,7 @@ GameObject: - component: {fileID: 8081380749606338833} - component: {fileID: 1302216385465840767} - component: {fileID: 8225243175500564362} - m_Layer: 0 + m_Layer: 3 m_Name: RedOgre m_TagString: Monster m_Icon: {fileID: 0} @@ -310,12 +310,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 @@ -324,8 +324,25 @@ MonoBehaviour: _spriteRenderer: {fileID: 4483099703633942840} _target: {fileID: 0} _collider: {fileID: 8010211321467272694} - defencePower: 10 _hpBarImage: {fileID: 0} + skillId: 0 + skillName: + damage: 0 + cooldown: 0 + 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!1 &4890974773502705404 GameObject: m_ObjectHideFlags: 0 @@ -337,7 +354,7 @@ GameObject: - component: {fileID: 5269932065289471453} - component: {fileID: 322635891004949583} - component: {fileID: 8512303292618116682} - m_Layer: 5 + m_Layer: 3 m_Name: Hp m_TagString: Untagged m_Icon: {fileID: 0} @@ -413,7 +430,7 @@ GameObject: - component: {fileID: 6674688860115672376} - component: {fileID: 1785402982075397255} - component: {fileID: 3017465808014795635} - m_Layer: 5 + m_Layer: 3 m_Name: Canvas m_TagString: Untagged m_Icon: {fileID: 0} @@ -595,7 +612,7 @@ GameObject: - component: {fileID: 640523308205634202} - component: {fileID: 3759356183817483344} - component: {fileID: 1452475910613953432} - m_Layer: 5 + m_Layer: 3 m_Name: HpBackground m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/YellowPumpkin.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/YellowPumpkin.prefab index 27cf8ac0..ed3c04cc 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/YellowPumpkin.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/YellowPumpkin.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 4304451839149930540} - component: {fileID: 4718982722803382852} - component: {fileID: 7305872687821404056} - m_Layer: 5 + m_Layer: 3 m_Name: Hp m_TagString: Untagged m_Icon: {fileID: 0} @@ -172,7 +172,7 @@ GameObject: - component: {fileID: 7221076290002234439} - component: {fileID: 4688595602896957101} - component: {fileID: 6455248859944411074} - m_Layer: 0 + m_Layer: 3 m_Name: YellowPumpkin m_TagString: Monster m_Icon: {fileID: 0} @@ -385,12 +385,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 @@ -399,8 +399,25 @@ MonoBehaviour: _spriteRenderer: {fileID: 7956262371853790530} _target: {fileID: 0} _collider: {fileID: 7092071574192076242} - defencePower: 10 _hpBarImage: {fileID: 0} + skillId: 0 + skillName: + damage: 0 + cooldown: 0 + 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!1 &6732329482384499360 GameObject: m_ObjectHideFlags: 0 @@ -412,7 +429,7 @@ GameObject: - component: {fileID: 1794590731142945778} - component: {fileID: 3131975546141117190} - component: {fileID: 8459873815434617724} - m_Layer: 5 + m_Layer: 3 m_Name: HpBackground m_TagString: Untagged m_Icon: {fileID: 0} @@ -489,7 +506,7 @@ GameObject: - component: {fileID: 8351309133449033177} - component: {fileID: 5238243821189215606} - component: {fileID: 6745605584629831773} - m_Layer: 5 + m_Layer: 3 m_Name: Canvas m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/PurpleOgre.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/PurpleOgre.prefab index f0b4b0e0..503def3e 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/PurpleOgre.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/PurpleOgre.prefab @@ -178,7 +178,7 @@ GameObject: - component: {fileID: 2236856411462380370} - component: {fileID: 4454810656460812043} - component: {fileID: 3995391487059577188} - m_Layer: 0 + m_Layer: 3 m_Name: PurpleOgre m_TagString: Monster m_Icon: {fileID: 0} @@ -390,12 +390,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 @@ -404,5 +404,22 @@ MonoBehaviour: _spriteRenderer: {fileID: 1562141709563587999} _target: {fileID: 0} _collider: {fileID: 9169777540349070535} - defencePower: 10 _hpBarImage: {fileID: 0} + skillId: 0 + skillName: + damage: 0 + cooldown: 0 + 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} diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/RedWerevolf.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/RedWerevolf.prefab index 326acef2..1f3e02d8 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/RedWerevolf.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/RedWerevolf.prefab @@ -178,7 +178,7 @@ GameObject: - component: {fileID: 8833145604824578523} - component: {fileID: 163468547258960914} - component: {fileID: 4902979615003904320} - m_Layer: 0 + m_Layer: 3 m_Name: RedWerevolf m_TagString: Monster m_Icon: {fileID: 0} @@ -390,12 +390,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 @@ -404,5 +404,22 @@ MonoBehaviour: _spriteRenderer: {fileID: 2474930132928432048} _target: {fileID: 0} _collider: {fileID: 1095721570886575037} - defencePower: 10 _hpBarImage: {fileID: 0} + skillId: 0 + skillName: + damage: 0 + cooldown: 0 + 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} 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 82748078..745fde23 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 @@ -13125,7 +13125,7 @@ GameObject: - component: {fileID: 309509380} - component: {fileID: 309509382} - component: {fileID: 309509381} - m_Layer: 5 + m_Layer: 3 m_Name: Hp m_TagString: Untagged m_Icon: {fileID: 0} @@ -17711,7 +17711,7 @@ GameObject: - component: {fileID: 431020301} - component: {fileID: 431020300} - component: {fileID: 431020299} - m_Layer: 0 + m_Layer: 3 m_Name: MonsterBase m_TagString: Monster m_Icon: {fileID: 0} @@ -18247,7 +18247,7 @@ GameObject: - component: {fileID: 457398687} - component: {fileID: 457398686} - component: {fileID: 457398685} - m_Layer: 5 + m_Layer: 3 m_Name: Canvas m_TagString: Untagged m_Icon: {fileID: 0} @@ -26807,7 +26807,7 @@ GameObject: - component: {fileID: 745690810} - component: {fileID: 745690812} - component: {fileID: 745690811} - m_Layer: 5 + m_Layer: 3 m_Name: HpBackground m_TagString: Untagged m_Icon: {fileID: 0} @@ -47902,6 +47902,67 @@ Sprite: m_PhysicsShape: [] m_Bones: [] m_SpriteID: +--- !u!1001 &1205629222 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 705413505888271155, guid: 69c66b62d5d42aa48b34c97c6131188f, type: 3} + propertyPath: _spriteRenderer + value: + objectReference: {fileID: 1862079974} + - target: {fileID: 4336427122757065448, guid: 69c66b62d5d42aa48b34c97c6131188f, type: 3} + propertyPath: m_Name + value: RedRex + objectReference: {fileID: 0} + - target: {fileID: 8864163214463241537, guid: 69c66b62d5d42aa48b34c97c6131188f, type: 3} + propertyPath: m_LocalPosition.x + value: 12.868645 + objectReference: {fileID: 0} + - target: {fileID: 8864163214463241537, guid: 69c66b62d5d42aa48b34c97c6131188f, type: 3} + propertyPath: m_LocalPosition.y + value: -7.968115 + objectReference: {fileID: 0} + - target: {fileID: 8864163214463241537, guid: 69c66b62d5d42aa48b34c97c6131188f, type: 3} + propertyPath: m_LocalPosition.z + value: 0.060982164 + objectReference: {fileID: 0} + - target: {fileID: 8864163214463241537, guid: 69c66b62d5d42aa48b34c97c6131188f, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8864163214463241537, guid: 69c66b62d5d42aa48b34c97c6131188f, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8864163214463241537, guid: 69c66b62d5d42aa48b34c97c6131188f, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8864163214463241537, guid: 69c66b62d5d42aa48b34c97c6131188f, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8864163214463241537, guid: 69c66b62d5d42aa48b34c97c6131188f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8864163214463241537, guid: 69c66b62d5d42aa48b34c97c6131188f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8864163214463241537, guid: 69c66b62d5d42aa48b34c97c6131188f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 69c66b62d5d42aa48b34c97c6131188f, type: 3} --- !u!114 &1207338009 MonoBehaviour: m_ObjectHideFlags: 0 @@ -68350,6 +68411,11 @@ MonoBehaviour: m_InstancedGameObject: {fileID: 0} m_Flags: 3 m_ColliderType: 1 +--- !u!212 &1862079974 stripped +SpriteRenderer: + m_CorrespondingSourceObject: {fileID: 7017725869417428001, guid: 69c66b62d5d42aa48b34c97c6131188f, type: 3} + m_PrefabInstance: {fileID: 1205629222} + m_PrefabAsset: {fileID: 0} --- !u!213 &1869212074 Sprite: m_ObjectHideFlags: 0 @@ -77765,3 +77831,4 @@ SceneRoots: - {fileID: 6994367162197659328} - {fileID: 9115962474533691980} - {fileID: 1043803241} + - {fileID: 1205629222} diff --git a/Gameton-06/ProjectSettings/Physics2DSettings.asset b/Gameton-06/ProjectSettings/Physics2DSettings.asset index a8777a18..94948a5b 100644 --- a/Gameton-06/ProjectSettings/Physics2DSettings.asset +++ b/Gameton-06/ProjectSettings/Physics2DSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:531861618163b01648a075414f6e864506ad8fe0a0d4d0096aa1fbbfcd3937dc +oid sha256:ccbc79ae710432e54c693397f799df90a24428fbc217a0be6c979543b7a47da3 size 1635