From a531fdfd737bcdf183247e7df2c3b4386db2709d Mon Sep 17 00:00:00 2001 From: Mingu Kim Date: Thu, 20 Feb 2025 18:19:46 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EB=AA=AC=EC=8A=A4=ED=84=B0=20=EA=B2=BD?= =?UTF-8?q?=EC=82=AC=EB=A1=9C=EC=97=90=EC=84=9C=20=EB=AF=B8=EB=81=8C?= =?UTF-8?q?=EB=A6=AC=EC=A7=80=20=EC=95=8A=EB=8F=84=EB=A1=9D=20=EC=BD=9C?= =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=8D=94=20=EB=B3=80=EA=B2=BD=20=EB=B0=8F=20?= =?UTF-8?q?=EB=A6=AC=EC=A7=80=EB=93=9C=EB=B0=94=EB=94=94=20=EC=88=98?= =?UTF-8?q?=EC=B9=98=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MonsterPrefabs/BlueDragon.prefab | 57 +- .../MonsterPrefabs/Boss/BlackWerewolf.prefab | 55 +- .../MonsterPrefabs/Boss/BlueTroll.prefab | 55 +- .../MonsterPrefabs/Boss/RedRex.prefab | 55 +- .../MonsterPrefabs/BrownWerewolf.prefab | 55 +- .../MonsterPrefabs/GreenDragon.prefab | 55 +- .../MonsterPrefabs/LastBoss/RedDragon.prefab | 55 +- .../MonsterPrefabs/Mid Boss/BlueRex.prefab | 55 +- .../Mid Boss/GreenPumpkin.prefab | 55 +- .../MonsterPrefabs/Mid Boss/GreenTroll.prefab | 55 +- .../MonsterPrefabs/MonsterBase.prefab | 777 ++++++++++++++++++ .../MonsterPrefabs/MonsterBase.prefab.meta | 7 + .../MonsterPrefabs/Nomal/BlackTroll.prefab | 55 +- .../MonsterPrefabs/Nomal/GreenOgre.prefab | 55 +- .../MonsterPrefabs/Nomal/GreenRex.prefab | 55 +- .../MonsterPrefabs/Nomal/PurplePumpkin.prefab | 55 +- .../MonsterPrefabs/Nomal/RedOgre.prefab | 55 +- .../MonsterPrefabs/Nomal/YellowPumpkin.prefab | 55 +- .../MonsterPrefabs/PurpleOgre.prefab | 55 +- .../MonsterPrefabs/RedWerevolf.prefab | 55 +- 20 files changed, 947 insertions(+), 829 deletions(-) create mode 100644 Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/MonsterBase.prefab create mode 100644 Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/MonsterBase.prefab.meta diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/BlueDragon.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/BlueDragon.prefab index e146407b..e4a928de 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/BlueDragon.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/BlueDragon.prefab @@ -174,7 +174,7 @@ GameObject: - component: {fileID: 1269702193996304710} - component: {fileID: 5587832068022808474} - component: {fileID: 7055471192544909809} - - component: {fileID: 1729542458489637078} + - component: {fileID: 3792872066456430441} - component: {fileID: 7452679976185027198} - component: {fileID: 5853913574187894824} - component: {fileID: 5857685127154262763} @@ -284,8 +284,8 @@ MonoBehaviour: m_labelHash: 9.842175e-15 m_SpriteKey: 0 m_SpriteHash: 850951566 ---- !u!61 &1729542458489637078 -BoxCollider2D: +--- !u!70 &3792872066456430441 +CapsuleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -293,7 +293,7 @@ BoxCollider2D: m_GameObject: {fileID: 8090057920360299341} m_Enabled: 1 m_Density: 1 - m_Material: {fileID: 6200000, guid: 4b1c6f7475961704286628d9fc21c1f2, type: 2} + m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 m_Bits: 0 @@ -316,19 +316,9 @@ BoxCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0, y: 1.3125} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0} - oldSize: {x: 8, y: 8} - newSize: {x: 8, y: 8} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 2, y: 2.5} - m_EdgeRadius: 0 + m_Offset: {x: 0, y: 1.5} + m_Size: {x: 3, y: 3.2} + m_Direction: 0 --- !u!50 &7452679976185027198 Rigidbody2D: serializedVersion: 4 @@ -343,8 +333,8 @@ Rigidbody2D: m_UseAutoMass: 0 m_Mass: 1 m_LinearDrag: 0 - m_AngularDrag: 0.05 - m_GravityScale: 1 + m_AngularDrag: 10 + m_GravityScale: 0 m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -390,36 +380,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: id: 0 - monsterName: - level: 0 - currentHP: 0 - attackPower: 0 defencePower: 10 - monsterSkillID: 0 - patrolRange: 0 - detectionRange: 0 - chaseRange: 0 - speed: 3 - attackRange: 0 _spriteRenderer: {fileID: 1269702193996304710} + _textState: {fileID: 0} _target: {fileID: 0} _collider: {fileID: 4617053352677362279} _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 b82af2fc..1c30b525 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Boss/BlackWerewolf.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Boss/BlackWerewolf.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 592092508951316932} - component: {fileID: 6258303630221964206} - component: {fileID: 5994009476868617428} - - component: {fileID: 647204486732619839} + - component: {fileID: 9081757152698912274} - component: {fileID: 2074022989821271346} - component: {fileID: 9136438650239437877} - component: {fileID: 9005905797466949371} @@ -122,8 +122,8 @@ MonoBehaviour: m_labelHash: 1.3971405e-28 m_SpriteKey: 0 m_SpriteHash: 163368403 ---- !u!61 &647204486732619839 -BoxCollider2D: +--- !u!70 &9081757152698912274 +CapsuleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -131,7 +131,7 @@ BoxCollider2D: m_GameObject: {fileID: 1437615078026375106} m_Enabled: 1 m_Density: 1 - m_Material: {fileID: 6200000, guid: 4b1c6f7475961704286628d9fc21c1f2, type: 2} + m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 m_Bits: 0 @@ -154,19 +154,9 @@ BoxCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0, y: 1.3125} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0} - oldSize: {x: 8, y: 8} - newSize: {x: 8, y: 8} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 2, y: 2.5} - m_EdgeRadius: 0 + m_Offset: {x: 0, y: 1.5} + m_Size: {x: 3, y: 3.2} + m_Direction: 0 --- !u!50 &2074022989821271346 Rigidbody2D: serializedVersion: 4 @@ -181,7 +171,7 @@ Rigidbody2D: m_UseAutoMass: 0 m_Mass: 1 m_LinearDrag: 0 - m_AngularDrag: 0.05 + m_AngularDrag: 10 m_GravityScale: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -228,39 +218,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: id: 0 - monsterName: - level: 0 - currentHP: 0 - attackPower: 0 defencePower: 10 - monsterSkillID: 0 - patrolRange: 0 - detectionRange: 0 - chaseRange: 0 - speed: 3 - attackRange: 0 _spriteRenderer: {fileID: 592092508951316932} + _textState: {fileID: 0} _target: {fileID: 0} _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 eed99214..9f4f6e66 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Boss/BlueTroll.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Boss/BlueTroll.prefab @@ -93,7 +93,7 @@ GameObject: - component: {fileID: 4721946587208924001} - component: {fileID: 7553500285414092728} - component: {fileID: 3953011498772820234} - - component: {fileID: 5917819929685729996} + - component: {fileID: 8307267935425774763} - component: {fileID: 2940668072414840122} - component: {fileID: 4782963675616737757} - component: {fileID: 8680259026051106041} @@ -203,8 +203,8 @@ MonoBehaviour: m_labelHash: 1.3971405e-28 m_SpriteKey: 0 m_SpriteHash: 163368403 ---- !u!61 &5917819929685729996 -BoxCollider2D: +--- !u!70 &8307267935425774763 +CapsuleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -212,7 +212,7 @@ BoxCollider2D: m_GameObject: {fileID: 2072207126235834940} m_Enabled: 1 m_Density: 1 - m_Material: {fileID: 6200000, guid: 4b1c6f7475961704286628d9fc21c1f2, type: 2} + m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 m_Bits: 0 @@ -235,19 +235,9 @@ BoxCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0, y: 1.3125} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0} - oldSize: {x: 8, y: 8} - newSize: {x: 8, y: 8} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 2, y: 2.5} - m_EdgeRadius: 0 + m_Offset: {x: 0, y: 1.5} + m_Size: {x: 3, y: 3.2} + m_Direction: 0 --- !u!50 &2940668072414840122 Rigidbody2D: serializedVersion: 4 @@ -262,7 +252,7 @@ Rigidbody2D: m_UseAutoMass: 0 m_Mass: 1 m_LinearDrag: 0 - m_AngularDrag: 0.05 + m_AngularDrag: 10 m_GravityScale: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -309,39 +299,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: id: 0 - monsterName: - level: 0 - currentHP: 0 - attackPower: 0 defencePower: 10 - monsterSkillID: 0 - patrolRange: 0 - detectionRange: 0 - chaseRange: 0 - speed: 3 - attackRange: 0 _spriteRenderer: {fileID: 4721946587208924001} + _textState: {fileID: 0} _target: {fileID: 0} _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 23bc09f4..0edb31bc 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Boss/RedRex.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Boss/RedRex.prefab @@ -93,7 +93,7 @@ GameObject: - component: {fileID: 7017725869417428001} - component: {fileID: 5511381648790622243} - component: {fileID: 5411962139750290266} - - component: {fileID: 4871871818723592515} + - component: {fileID: 7183579659019982964} - component: {fileID: 5224079812717155775} - component: {fileID: 7645539626140565081} - component: {fileID: 705413505888271155} @@ -203,8 +203,8 @@ MonoBehaviour: m_labelHash: 1.3971405e-28 m_SpriteKey: 0 m_SpriteHash: 163368403 ---- !u!61 &4871871818723592515 -BoxCollider2D: +--- !u!70 &7183579659019982964 +CapsuleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -212,7 +212,7 @@ BoxCollider2D: m_GameObject: {fileID: 4336427122757065448} m_Enabled: 1 m_Density: 1 - m_Material: {fileID: 6200000, guid: 4b1c6f7475961704286628d9fc21c1f2, type: 2} + m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 m_Bits: 0 @@ -235,19 +235,9 @@ BoxCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0, y: 1.3125} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0} - oldSize: {x: 8, y: 8} - newSize: {x: 8, y: 8} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 2, y: 2.5} - m_EdgeRadius: 0 + m_Offset: {x: 0, y: 1.5} + m_Size: {x: 3, y: 3.2} + m_Direction: 0 --- !u!50 &5224079812717155775 Rigidbody2D: serializedVersion: 4 @@ -262,7 +252,7 @@ Rigidbody2D: m_UseAutoMass: 0 m_Mass: 1 m_LinearDrag: 0 - m_AngularDrag: 0.05 + m_AngularDrag: 10 m_GravityScale: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -309,39 +299,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: id: 0 - monsterName: - level: 0 - currentHP: 0 - attackPower: 0 defencePower: 10 - monsterSkillID: 0 - patrolRange: 0 - detectionRange: 0 - chaseRange: 0 - speed: 3 - attackRange: 0 _spriteRenderer: {fileID: 7017725869417428001} + _textState: {fileID: 0} _target: {fileID: 0} _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/BrownWerewolf.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/BrownWerewolf.prefab index a92e1608..d54fd43d 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/BrownWerewolf.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/BrownWerewolf.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 2421631177632172315} - component: {fileID: 7732192339016745561} - component: {fileID: 6706683064429148190} - - component: {fileID: 3829686544596082344} + - component: {fileID: 3886534966705013785} - component: {fileID: 6990484051444959619} - component: {fileID: 4461708158762166693} - component: {fileID: 2162079424076978325} @@ -122,8 +122,8 @@ MonoBehaviour: m_labelHash: 1.3971405e-28 m_SpriteKey: 0 m_SpriteHash: 163368403 ---- !u!61 &3829686544596082344 -BoxCollider2D: +--- !u!70 &3886534966705013785 +CapsuleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -131,7 +131,7 @@ BoxCollider2D: m_GameObject: {fileID: 3538456168238866987} m_Enabled: 1 m_Density: 1 - m_Material: {fileID: 6200000, guid: 4b1c6f7475961704286628d9fc21c1f2, type: 2} + m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 m_Bits: 0 @@ -154,19 +154,9 @@ BoxCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0, y: 1.3125} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0} - oldSize: {x: 8, y: 8} - newSize: {x: 8, y: 8} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 2, y: 2.5} - m_EdgeRadius: 0 + m_Offset: {x: 0, y: 1.5} + m_Size: {x: 3, y: 3.2} + m_Direction: 0 --- !u!50 &6990484051444959619 Rigidbody2D: serializedVersion: 4 @@ -181,7 +171,7 @@ Rigidbody2D: m_UseAutoMass: 0 m_Mass: 1 m_LinearDrag: 0 - m_AngularDrag: 0.05 + m_AngularDrag: 10 m_GravityScale: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -228,39 +218,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: id: 0 - monsterName: - level: 0 - currentHP: 0 - attackPower: 0 defencePower: 10 - monsterSkillID: 0 - patrolRange: 0 - detectionRange: 0 - chaseRange: 0 - speed: 3 - attackRange: 0 _spriteRenderer: {fileID: 2421631177632172315} + _textState: {fileID: 0} _target: {fileID: 0} _collider: {fileID: 2538243315479772474} _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 2a0c5402..4e94495f 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/GreenDragon.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/GreenDragon.prefab @@ -174,7 +174,7 @@ GameObject: - component: {fileID: 7440930953996616536} - component: {fileID: 7669319752494194} - component: {fileID: 6575755196184095025} - - component: {fileID: 1134922864493937763} + - component: {fileID: 3423511076627252598} - component: {fileID: 6629833030535884371} - component: {fileID: 6774294030256895352} - component: {fileID: 1035882020918319644} @@ -284,8 +284,8 @@ MonoBehaviour: m_labelHash: 1.3971405e-28 m_SpriteKey: 0 m_SpriteHash: 163368403 ---- !u!61 &1134922864493937763 -BoxCollider2D: +--- !u!70 &3423511076627252598 +CapsuleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -293,7 +293,7 @@ BoxCollider2D: m_GameObject: {fileID: 8543761618442065577} m_Enabled: 1 m_Density: 1 - m_Material: {fileID: 6200000, guid: 4b1c6f7475961704286628d9fc21c1f2, type: 2} + m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 m_Bits: 0 @@ -316,19 +316,9 @@ BoxCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0, y: 1.3125} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0} - oldSize: {x: 8, y: 8} - newSize: {x: 8, y: 8} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 2, y: 2.5} - m_EdgeRadius: 0 + m_Offset: {x: 0, y: 1.5} + m_Size: {x: 3, y: 3.2} + m_Direction: 0 --- !u!50 &6629833030535884371 Rigidbody2D: serializedVersion: 4 @@ -343,7 +333,7 @@ Rigidbody2D: m_UseAutoMass: 0 m_Mass: 1 m_LinearDrag: 0 - m_AngularDrag: 0.05 + m_AngularDrag: 10 m_GravityScale: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -390,36 +380,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: id: 0 - monsterName: - level: 0 - currentHP: 0 - attackPower: 0 defencePower: 10 - monsterSkillID: 0 - patrolRange: 0 - detectionRange: 0 - chaseRange: 0 - speed: 3 - attackRange: 0 _spriteRenderer: {fileID: 7440930953996616536} + _textState: {fileID: 0} _target: {fileID: 0} _collider: {fileID: 2019777489571142283} _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 f83e46de..e437426e 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/LastBoss/RedDragon.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/LastBoss/RedDragon.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 8612529477884142844} - component: {fileID: 5983613375061761259} - component: {fileID: 2614031778910143229} - - component: {fileID: 2200367669627990978} + - component: {fileID: 7644234436033515304} - component: {fileID: 6411907760444170154} - component: {fileID: 4409121389344890060} - component: {fileID: 172749484477612116} @@ -122,8 +122,8 @@ MonoBehaviour: m_labelHash: 9.842175e-15 m_SpriteKey: 0 m_SpriteHash: 850951566 ---- !u!61 &2200367669627990978 -BoxCollider2D: +--- !u!70 &7644234436033515304 +CapsuleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -131,7 +131,7 @@ BoxCollider2D: m_GameObject: {fileID: 3667660097767351871} m_Enabled: 1 m_Density: 1 - m_Material: {fileID: 6200000, guid: 4b1c6f7475961704286628d9fc21c1f2, type: 2} + m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 m_Bits: 0 @@ -154,19 +154,9 @@ BoxCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0, y: 1.3125} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0} - oldSize: {x: 8, y: 8} - newSize: {x: 8, y: 8} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 2, y: 2.5} - m_EdgeRadius: 0 + m_Offset: {x: 0, y: 1.5} + m_Size: {x: 3, y: 3.2} + m_Direction: 0 --- !u!50 &6411907760444170154 Rigidbody2D: serializedVersion: 4 @@ -181,7 +171,7 @@ Rigidbody2D: m_UseAutoMass: 0 m_Mass: 1 m_LinearDrag: 0 - m_AngularDrag: 0.05 + m_AngularDrag: 10 m_GravityScale: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -228,39 +218,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: id: 0 - monsterName: - level: 0 - currentHP: 0 - attackPower: 0 defencePower: 10 - monsterSkillID: 0 - patrolRange: 0 - detectionRange: 0 - chaseRange: 0 - speed: 3 - attackRange: 0 _spriteRenderer: {fileID: 8612529477884142844} + _textState: {fileID: 0} _target: {fileID: 0} _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/Mid Boss/BlueRex.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Mid Boss/BlueRex.prefab index 2b7ef78e..792c1765 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Mid Boss/BlueRex.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Mid Boss/BlueRex.prefab @@ -427,7 +427,7 @@ GameObject: - component: {fileID: 5120407950894233432} - component: {fileID: 5760437580142351553} - component: {fileID: 4521564712471260062} - - component: {fileID: 1551045961374103160} + - component: {fileID: 2409723642906008977} - component: {fileID: 5073062528371734196} - component: {fileID: 6967364099735454947} - component: {fileID: 1587851352149786247} @@ -538,8 +538,8 @@ MonoBehaviour: m_labelHash: 1.3971405e-28 m_SpriteKey: 0 m_SpriteHash: 163368403 ---- !u!61 &1551045961374103160 -BoxCollider2D: +--- !u!70 &2409723642906008977 +CapsuleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -547,7 +547,7 @@ BoxCollider2D: m_GameObject: {fileID: 8816565783318691943} m_Enabled: 1 m_Density: 1 - m_Material: {fileID: 6200000, guid: 4b1c6f7475961704286628d9fc21c1f2, type: 2} + m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 m_Bits: 0 @@ -570,19 +570,9 @@ BoxCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0, y: 1.3125} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0} - oldSize: {x: 8, y: 8} - newSize: {x: 8, y: 8} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 2, y: 2.5} - m_EdgeRadius: 0 + m_Offset: {x: 0, y: 1.5} + m_Size: {x: 3, y: 3.2} + m_Direction: 0 --- !u!50 &5073062528371734196 Rigidbody2D: serializedVersion: 4 @@ -597,7 +587,7 @@ Rigidbody2D: m_UseAutoMass: 0 m_Mass: 1 m_LinearDrag: 0 - m_AngularDrag: 0.05 + m_AngularDrag: 10 m_GravityScale: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -644,36 +634,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: id: 0 - monsterName: - level: 0 - currentHP: 0 - attackPower: 0 defencePower: 10 - monsterSkillID: 0 - patrolRange: 0 - detectionRange: 0 - chaseRange: 0 - speed: 3 - attackRange: 0 _spriteRenderer: {fileID: 5120407950894233432} + _textState: {fileID: 0} _target: {fileID: 0} _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 dba1f0d4..fabd10f2 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Mid Boss/GreenPumpkin.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Mid Boss/GreenPumpkin.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 453936598381272866} - component: {fileID: 1241280608951643893} - component: {fileID: 4624217956230953747} - - component: {fileID: 8869388007015399415} + - component: {fileID: 6511188703245304490} - component: {fileID: 6477984660058860789} - component: {fileID: 3731684883505981096} - component: {fileID: 4429443442002592585} @@ -123,8 +123,8 @@ MonoBehaviour: m_labelHash: 1.3971405e-28 m_SpriteKey: 0 m_SpriteHash: 163368403 ---- !u!61 &8869388007015399415 -BoxCollider2D: +--- !u!70 &6511188703245304490 +CapsuleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -132,7 +132,7 @@ BoxCollider2D: m_GameObject: {fileID: 1572774641510885509} m_Enabled: 1 m_Density: 1 - m_Material: {fileID: 6200000, guid: 4b1c6f7475961704286628d9fc21c1f2, type: 2} + m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 m_Bits: 0 @@ -155,19 +155,9 @@ BoxCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0, y: 1.3125} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0} - oldSize: {x: 8, y: 8} - newSize: {x: 8, y: 8} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 2, y: 2.5} - m_EdgeRadius: 0 + m_Offset: {x: 0, y: 1.5} + m_Size: {x: 3, y: 3.2} + m_Direction: 0 --- !u!50 &6477984660058860789 Rigidbody2D: serializedVersion: 4 @@ -182,7 +172,7 @@ Rigidbody2D: m_UseAutoMass: 0 m_Mass: 1 m_LinearDrag: 0 - m_AngularDrag: 0.05 + m_AngularDrag: 10 m_GravityScale: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -229,39 +219,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: id: 0 - monsterName: - level: 0 - currentHP: 0 - attackPower: 0 defencePower: 10 - monsterSkillID: 0 - patrolRange: 0 - detectionRange: 0 - chaseRange: 0 - speed: 3 - attackRange: 0 _spriteRenderer: {fileID: 453936598381272866} + _textState: {fileID: 0} _target: {fileID: 0} _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 8e7df237..20c7f25b 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Mid Boss/GreenTroll.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Mid Boss/GreenTroll.prefab @@ -352,7 +352,7 @@ GameObject: - component: {fileID: 6858484445723671200} - component: {fileID: 2400751669013158094} - component: {fileID: 8587876857042752383} - - component: {fileID: 1646835355960599802} + - component: {fileID: 7682347904007741319} - component: {fileID: 7933855234752634587} - component: {fileID: 3833828277223620329} - component: {fileID: 5393490782033978316} @@ -463,8 +463,8 @@ MonoBehaviour: m_labelHash: 1.3971405e-28 m_SpriteKey: 0 m_SpriteHash: 163368403 ---- !u!61 &1646835355960599802 -BoxCollider2D: +--- !u!70 &7682347904007741319 +CapsuleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -472,7 +472,7 @@ BoxCollider2D: m_GameObject: {fileID: 7872183108645210487} m_Enabled: 1 m_Density: 1 - m_Material: {fileID: 6200000, guid: 4b1c6f7475961704286628d9fc21c1f2, type: 2} + m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 m_Bits: 0 @@ -495,19 +495,9 @@ BoxCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0, y: 1.3125} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0} - oldSize: {x: 8, y: 8} - newSize: {x: 8, y: 8} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 2, y: 2.5} - m_EdgeRadius: 0 + m_Offset: {x: 0, y: 1.5} + m_Size: {x: 3, y: 3.2} + m_Direction: 0 --- !u!50 &7933855234752634587 Rigidbody2D: serializedVersion: 4 @@ -522,7 +512,7 @@ Rigidbody2D: m_UseAutoMass: 0 m_Mass: 1 m_LinearDrag: 0 - m_AngularDrag: 0.05 + m_AngularDrag: 10 m_GravityScale: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -569,39 +559,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: id: 0 - monsterName: - level: 0 - currentHP: 0 - attackPower: 0 defencePower: 10 - monsterSkillID: 0 - patrolRange: 0 - detectionRange: 0 - chaseRange: 0 - speed: 3 - attackRange: 0 _spriteRenderer: {fileID: 6858484445723671200} + _textState: {fileID: 0} _target: {fileID: 0} _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/Resources/MonsterPrefabs/MonsterBase.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/MonsterBase.prefab new file mode 100644 index 00000000..19d116c5 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/MonsterBase.prefab @@ -0,0 +1,777 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &830720770730698089 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4964205710490458951} + - component: {fileID: 8937548059137881118} + - component: {fileID: 3193291408954251952} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4964205710490458951 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 830720770730698089} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2342851905308981024} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 736, y: -199.3} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8937548059137881118 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 830720770730698089} + m_CullTransparentMesh: 1 +--- !u!114 &3193291408954251952 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 830720770730698089} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: New Text + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &1278407336777427455 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2342851905308981024} + - component: {fileID: 7389990213712730381} + - component: {fileID: 3897535099489534608} + - component: {fileID: 8253800009562448269} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2342851905308981024 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1278407336777427455} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2226066675516772352} + - {fileID: 4964205710490458951} + m_Father: {fileID: 5137574338301747364} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!223 &7389990213712730381 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1278407336777427455} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &3897535099489534608 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1278407336777427455} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!114 &8253800009562448269 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1278407336777427455} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 63 +--- !u!1 &2325674947950350118 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2008850565575201629} + - component: {fileID: 4327419956871024413} + - component: {fileID: 8552770853218670454} + m_Layer: 5 + m_Name: Hp + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2008850565575201629 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2325674947950350118} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2226066675516772352} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 96.000046, y: 0.0000077784} + m_SizeDelta: {x: 185.0602, y: 12.1787} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4327419956871024413 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2325674947950350118} + m_CullTransparentMesh: 1 +--- !u!114 &8552770853218670454 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2325674947950350118} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2834565004235491251 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7105460098811642705} + - component: {fileID: 6308846340084452175} + - component: {fileID: 3186061844150587201} + m_Layer: 3 + m_Name: Eyesight + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7105460098811642705 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2834565004235491251} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 9, y: 1, z: 11} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5137574338301747364} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!58 &6308846340084452175 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2834565004235491251} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.5 +--- !u!114 &3186061844150587201 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2834565004235491251} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0eeefb865ea9d4749bbb4de3d1100f3e, type: 3} + m_Name: + m_EditorClassIdentifier: + _monsterBase: {fileID: 2762358464908385900} +--- !u!1 &5881572271698310704 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2226066675516772352} + - component: {fileID: 5577646306301035689} + - component: {fileID: 3105230950195063146} + m_Layer: 5 + m_Name: HpBackground + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2226066675516772352 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5881572271698310704} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2008850565575201629} + m_Father: {fileID: 2342851905308981024} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 716, y: -250} + m_SizeDelta: {x: 191.466, y: 18.1851} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5577646306301035689 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5881572271698310704} + m_CullTransparentMesh: 1 +--- !u!114 &3105230950195063146 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5881572271698310704} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6773759796010523033 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6230508423885210734} + - component: {fileID: 5206742955711697633} + - component: {fileID: 6403351759849135038} + m_Layer: 3 + m_Name: AttackRange + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6230508423885210734 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6773759796010523033} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 9, y: 1, z: 11} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5137574338301747364} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!58 &5206742955711697633 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6773759796010523033} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.25 +--- !u!114 &6403351759849135038 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6773759796010523033} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0913d8f50c531ce4585705c1366b8351, type: 3} + m_Name: + m_EditorClassIdentifier: + _monsterBase: {fileID: 2762358464908385900} +--- !u!1 &8877229262118324966 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5137574338301747364} + - component: {fileID: 7529954780571693353} + - component: {fileID: 1978886931618631332} + - component: {fileID: 1696954854365610771} + - component: {fileID: 194282152359623176} + - component: {fileID: 8259038157809345769} + - component: {fileID: 7193653635743404043} + - component: {fileID: 2762358464908385900} + m_Layer: 3 + m_Name: MonsterBase + m_TagString: Monster + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5137574338301747364 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8877229262118324966} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 12.94, y: -7.91, z: 0.060982164} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7105460098811642705} + - {fileID: 6230508423885210734} + - {fileID: 2342851905308981024} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7529954780571693353 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8877229262118324966} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 4723107735738678597, guid: 8c818873fb8d4ad3bb40ebb62d906a1d, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 1 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 8, y: 8} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &1978886931618631332 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8877229262118324966} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c29cff538c195c249b69c6f2236de67b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Library: [] + m_SpriteLibraryAsset: {fileID: 7108339969198208228, guid: 73291ecd56a9d3a48a11c4deb171ada8, type: 3} +--- !u!114 &1696954854365610771 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8877229262118324966} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ed8b1ae4e4e52b34ea557c1c11e076fc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_CategoryHash: 0.009161512 + m_labelHash: 1.3971405e-28 + m_SpriteKey: 0 + m_SpriteHash: 163368403 +--- !u!70 &194282152359623176 +CapsuleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8877229262118324966} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 1.5} + m_Size: {x: 3, y: 3.2} + m_Direction: 0 +--- !u!50 &8259038157809345769 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8877229262118324966} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 10 + m_GravityScale: 1 + 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: 4 +--- !u!95 &7193653635743404043 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8877229262118324966} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: c2be6a32c13b7d24fb2d789462ff8e2f, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &2762358464908385900 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8877229262118324966} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d5b05a0586cd17f47a3c35acaac06e0f, type: 3} + m_Name: + m_EditorClassIdentifier: + id: 0 + defencePower: 10 + _spriteRenderer: {fileID: 7529954780571693353} + _textState: {fileID: 3193291408954251952} + _target: {fileID: 0} + _collider: {fileID: 6308846340084452175} + _hpBarImage: {fileID: 2325674947950350118} diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/MonsterBase.prefab.meta b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/MonsterBase.prefab.meta new file mode 100644 index 00000000..5a99f860 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/MonsterBase.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 95a2a767cd0699c4aa3198f36305ac04 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/BlackTroll.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/BlackTroll.prefab index b880bc92..217d648f 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/BlackTroll.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/BlackTroll.prefab @@ -244,7 +244,7 @@ GameObject: - component: {fileID: 5636364246843047355} - component: {fileID: 6630971208790554073} - component: {fileID: 1937602755592253170} - - component: {fileID: 5268072475136291718} + - component: {fileID: 8193311856622011356} - component: {fileID: 3755389356996766134} - component: {fileID: 4593226769141903835} - component: {fileID: 4707985683249688333} @@ -355,8 +355,8 @@ MonoBehaviour: m_labelHash: 1.3971405e-28 m_SpriteKey: 0 m_SpriteHash: 163368403 ---- !u!61 &5268072475136291718 -BoxCollider2D: +--- !u!70 &8193311856622011356 +CapsuleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -364,7 +364,7 @@ BoxCollider2D: m_GameObject: {fileID: 4212413503337481881} m_Enabled: 1 m_Density: 1 - m_Material: {fileID: 6200000, guid: 4b1c6f7475961704286628d9fc21c1f2, type: 2} + m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 m_Bits: 0 @@ -387,19 +387,9 @@ BoxCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0, y: 1.3125} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0} - oldSize: {x: 8, y: 8} - newSize: {x: 8, y: 8} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 2, y: 2.5} - m_EdgeRadius: 0 + m_Offset: {x: 0, y: 1.5} + m_Size: {x: 3, y: 3.2} + m_Direction: 0 --- !u!50 &3755389356996766134 Rigidbody2D: serializedVersion: 4 @@ -414,7 +404,7 @@ Rigidbody2D: m_UseAutoMass: 0 m_Mass: 1 m_LinearDrag: 0 - m_AngularDrag: 0.05 + m_AngularDrag: 10 m_GravityScale: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -461,39 +451,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: id: 0 - monsterName: - level: 0 - currentHP: 0 - attackPower: 0 defencePower: 10 - monsterSkillID: 0 - patrolRange: 0 - detectionRange: 0 - chaseRange: 0 - speed: 3 - attackRange: 0 _spriteRenderer: {fileID: 5636364246843047355} + _textState: {fileID: 0} _target: {fileID: 0} _collider: {fileID: 6768085599137241520} _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 diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/GreenOgre.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/GreenOgre.prefab index 9de28496..9dbb8b96 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/GreenOgre.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/GreenOgre.prefab @@ -346,7 +346,7 @@ GameObject: - component: {fileID: 4428022325186423475} - component: {fileID: 4959486709279360796} - component: {fileID: 1188152749383066607} - - component: {fileID: 4394625947515277159} + - component: {fileID: 1780545487136161349} - component: {fileID: 220072405918019578} - component: {fileID: 3599791498772529637} - component: {fileID: 4682527902446353803} @@ -457,8 +457,8 @@ MonoBehaviour: m_labelHash: 1.3971405e-28 m_SpriteKey: 0 m_SpriteHash: 163368403 ---- !u!61 &4394625947515277159 -BoxCollider2D: +--- !u!70 &1780545487136161349 +CapsuleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -466,7 +466,7 @@ BoxCollider2D: m_GameObject: {fileID: 5723786479962814242} m_Enabled: 1 m_Density: 1 - m_Material: {fileID: 6200000, guid: 4b1c6f7475961704286628d9fc21c1f2, type: 2} + m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 m_Bits: 0 @@ -489,19 +489,9 @@ BoxCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0, y: 1.3125} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0} - oldSize: {x: 8, y: 8} - newSize: {x: 8, y: 8} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 2, y: 2.5} - m_EdgeRadius: 0 + m_Offset: {x: 0, y: 1.5} + m_Size: {x: 3, y: 3.2} + m_Direction: 0 --- !u!50 &220072405918019578 Rigidbody2D: serializedVersion: 4 @@ -516,7 +506,7 @@ Rigidbody2D: m_UseAutoMass: 0 m_Mass: 1 m_LinearDrag: 0 - m_AngularDrag: 0.05 + m_AngularDrag: 10 m_GravityScale: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -563,39 +553,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: id: 0 - monsterName: - level: 0 - currentHP: 0 - attackPower: 0 defencePower: 10 - monsterSkillID: 0 - patrolRange: 0 - detectionRange: 0 - chaseRange: 0 - speed: 3 - attackRange: 0 _spriteRenderer: {fileID: 4428022325186423475} + _textState: {fileID: 0} _target: {fileID: 0} _collider: {fileID: 898726376241471782} _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/GreenRex.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/GreenRex.prefab index 916035f6..f2eccf21 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/GreenRex.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/GreenRex.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 1884691218758219349} - component: {fileID: 988980073547303049} - component: {fileID: 3538883998523555671} - - component: {fileID: 8085872100693080346} + - component: {fileID: 6050709254010833369} - component: {fileID: 7017750443104886884} - component: {fileID: 7864811774615096756} - component: {fileID: 8281494938760581564} @@ -123,8 +123,8 @@ MonoBehaviour: m_labelHash: 1.3971405e-28 m_SpriteKey: 0 m_SpriteHash: 163368403 ---- !u!61 &8085872100693080346 -BoxCollider2D: +--- !u!70 &6050709254010833369 +CapsuleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -132,7 +132,7 @@ BoxCollider2D: m_GameObject: {fileID: 552750714948243596} m_Enabled: 1 m_Density: 1 - m_Material: {fileID: 6200000, guid: 4b1c6f7475961704286628d9fc21c1f2, type: 2} + m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 m_Bits: 0 @@ -155,19 +155,9 @@ BoxCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0, y: 1.3125} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0} - oldSize: {x: 8, y: 8} - newSize: {x: 8, y: 8} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 2, y: 2.5} - m_EdgeRadius: 0 + m_Offset: {x: 0, y: 1.5} + m_Size: {x: 3, y: 3.2} + m_Direction: 0 --- !u!50 &7017750443104886884 Rigidbody2D: serializedVersion: 4 @@ -182,7 +172,7 @@ Rigidbody2D: m_UseAutoMass: 0 m_Mass: 1 m_LinearDrag: 0 - m_AngularDrag: 0.05 + m_AngularDrag: 10 m_GravityScale: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -229,39 +219,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: id: 0 - monsterName: - level: 0 - currentHP: 0 - attackPower: 0 defencePower: 10 - monsterSkillID: 0 - patrolRange: 0 - detectionRange: 0 - chaseRange: 0 - speed: 3 - attackRange: 0 _spriteRenderer: {fileID: 1884691218758219349} + _textState: {fileID: 0} _target: {fileID: 0} _collider: {fileID: 3873838448514641420} _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 diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/PurplePumpkin.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/PurplePumpkin.prefab index 1d045d0d..78f0d080 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/PurplePumpkin.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/PurplePumpkin.prefab @@ -427,7 +427,7 @@ GameObject: - component: {fileID: 6907519990020749312} - component: {fileID: 6352256114534178882} - component: {fileID: 8176984328601011579} - - component: {fileID: 363476269087567278} + - component: {fileID: 7489368290972512581} - component: {fileID: 988547533290132143} - component: {fileID: 3031469019251174195} - component: {fileID: 3877897766620331718} @@ -538,8 +538,8 @@ MonoBehaviour: m_labelHash: 1.3971405e-28 m_SpriteKey: 0 m_SpriteHash: 163368403 ---- !u!61 &363476269087567278 -BoxCollider2D: +--- !u!70 &7489368290972512581 +CapsuleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -547,7 +547,7 @@ BoxCollider2D: m_GameObject: {fileID: 9096056522544909490} m_Enabled: 1 m_Density: 1 - m_Material: {fileID: 6200000, guid: 4b1c6f7475961704286628d9fc21c1f2, type: 2} + m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 m_Bits: 0 @@ -570,19 +570,9 @@ BoxCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0, y: 1.3125} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0} - oldSize: {x: 8, y: 8} - newSize: {x: 8, y: 8} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 2, y: 2.5} - m_EdgeRadius: 0 + m_Offset: {x: 0, y: 1.5} + m_Size: {x: 3, y: 3.2} + m_Direction: 0 --- !u!50 &988547533290132143 Rigidbody2D: serializedVersion: 4 @@ -597,7 +587,7 @@ Rigidbody2D: m_UseAutoMass: 0 m_Mass: 1 m_LinearDrag: 0 - m_AngularDrag: 0.05 + m_AngularDrag: 10 m_GravityScale: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -644,36 +634,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: id: 0 - monsterName: - level: 0 - currentHP: 0 - attackPower: 0 defencePower: 10 - monsterSkillID: 0 - patrolRange: 0 - detectionRange: 0 - chaseRange: 0 - speed: 3 - attackRange: 0 _spriteRenderer: {fileID: 6907519990020749312} + _textState: {fileID: 0} _target: {fileID: 0} _collider: {fileID: 8798441981702176517} _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 00d9acc7..aada4a09 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/RedOgre.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/RedOgre.prefab @@ -93,7 +93,7 @@ GameObject: - component: {fileID: 4483099703633942840} - component: {fileID: 2473484301775547774} - component: {fileID: 809807674394624204} - - component: {fileID: 3343592197997377036} + - component: {fileID: 3748884537384473674} - component: {fileID: 8081380749606338833} - component: {fileID: 1302216385465840767} - component: {fileID: 8225243175500564362} @@ -204,8 +204,8 @@ MonoBehaviour: m_labelHash: 1.3971405e-28 m_SpriteKey: 0 m_SpriteHash: 163368403 ---- !u!61 &3343592197997377036 -BoxCollider2D: +--- !u!70 &3748884537384473674 +CapsuleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -213,7 +213,7 @@ BoxCollider2D: m_GameObject: {fileID: 3763998402670485858} m_Enabled: 1 m_Density: 1 - m_Material: {fileID: 6200000, guid: 4b1c6f7475961704286628d9fc21c1f2, type: 2} + m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 m_Bits: 0 @@ -236,19 +236,9 @@ BoxCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0, y: 1.3125} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0} - oldSize: {x: 8, y: 8} - newSize: {x: 8, y: 8} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 2, y: 2.5} - m_EdgeRadius: 0 + m_Offset: {x: 0, y: 1.5} + m_Size: {x: 3, y: 3.2} + m_Direction: 0 --- !u!50 &8081380749606338833 Rigidbody2D: serializedVersion: 4 @@ -263,7 +253,7 @@ Rigidbody2D: m_UseAutoMass: 0 m_Mass: 1 m_LinearDrag: 0 - m_AngularDrag: 0.05 + m_AngularDrag: 10 m_GravityScale: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -310,39 +300,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: id: 0 - monsterName: - level: 0 - currentHP: 0 - attackPower: 0 defencePower: 10 - monsterSkillID: 0 - patrolRange: 0 - detectionRange: 0 - chaseRange: 0 - speed: 3 - attackRange: 0 _spriteRenderer: {fileID: 4483099703633942840} + _textState: {fileID: 0} _target: {fileID: 0} _collider: {fileID: 8010211321467272694} _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 diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/YellowPumpkin.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/YellowPumpkin.prefab index ed3c04cc..3ff9a6ef 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/YellowPumpkin.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/Nomal/YellowPumpkin.prefab @@ -168,7 +168,7 @@ GameObject: - component: {fileID: 7956262371853790530} - component: {fileID: 5910078735670022208} - component: {fileID: 3348129341112538516} - - component: {fileID: 8352341723465532710} + - component: {fileID: 223963524124807000} - component: {fileID: 7221076290002234439} - component: {fileID: 4688595602896957101} - component: {fileID: 6455248859944411074} @@ -279,8 +279,8 @@ MonoBehaviour: m_labelHash: 1.3971405e-28 m_SpriteKey: 0 m_SpriteHash: 163368403 ---- !u!61 &8352341723465532710 -BoxCollider2D: +--- !u!70 &223963524124807000 +CapsuleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -288,7 +288,7 @@ BoxCollider2D: m_GameObject: {fileID: 5532926939721588456} m_Enabled: 1 m_Density: 1 - m_Material: {fileID: 6200000, guid: 4b1c6f7475961704286628d9fc21c1f2, type: 2} + m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 m_Bits: 0 @@ -311,19 +311,9 @@ BoxCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0, y: 1.3125} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0} - oldSize: {x: 8, y: 8} - newSize: {x: 8, y: 8} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 2, y: 2.5} - m_EdgeRadius: 0 + m_Offset: {x: 0, y: 1.5} + m_Size: {x: 3, y: 3.2} + m_Direction: 0 --- !u!50 &7221076290002234439 Rigidbody2D: serializedVersion: 4 @@ -338,7 +328,7 @@ Rigidbody2D: m_UseAutoMass: 0 m_Mass: 1 m_LinearDrag: 0 - m_AngularDrag: 0.05 + m_AngularDrag: 10 m_GravityScale: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -385,39 +375,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: id: 0 - monsterName: - level: 0 - currentHP: 0 - attackPower: 0 defencePower: 10 - monsterSkillID: 0 - patrolRange: 0 - detectionRange: 0 - chaseRange: 0 - speed: 3 - attackRange: 0 _spriteRenderer: {fileID: 7956262371853790530} + _textState: {fileID: 0} _target: {fileID: 0} _collider: {fileID: 7092071574192076242} _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 diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/PurpleOgre.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/PurpleOgre.prefab index 503def3e..3b013b9e 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/PurpleOgre.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/PurpleOgre.prefab @@ -174,7 +174,7 @@ GameObject: - component: {fileID: 1562141709563587999} - component: {fileID: 4165875272688998485} - component: {fileID: 7267689566088411958} - - component: {fileID: 3792154145834349163} + - component: {fileID: 4484443473250828341} - component: {fileID: 2236856411462380370} - component: {fileID: 4454810656460812043} - component: {fileID: 3995391487059577188} @@ -284,8 +284,8 @@ MonoBehaviour: m_labelHash: 1.3971405e-28 m_SpriteKey: 0 m_SpriteHash: 163368403 ---- !u!61 &3792154145834349163 -BoxCollider2D: +--- !u!70 &4484443473250828341 +CapsuleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -293,7 +293,7 @@ BoxCollider2D: m_GameObject: {fileID: 6843894410035762253} m_Enabled: 1 m_Density: 1 - m_Material: {fileID: 6200000, guid: 4b1c6f7475961704286628d9fc21c1f2, type: 2} + m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 m_Bits: 0 @@ -316,19 +316,9 @@ BoxCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0, y: 1.3125} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0} - oldSize: {x: 8, y: 8} - newSize: {x: 8, y: 8} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 2, y: 2.5} - m_EdgeRadius: 0 + m_Offset: {x: 0, y: 1.5} + m_Size: {x: 3, y: 3.2} + m_Direction: 0 --- !u!50 &2236856411462380370 Rigidbody2D: serializedVersion: 4 @@ -343,7 +333,7 @@ Rigidbody2D: m_UseAutoMass: 0 m_Mass: 1 m_LinearDrag: 0 - m_AngularDrag: 0.05 + m_AngularDrag: 10 m_GravityScale: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -390,36 +380,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: id: 0 - monsterName: - level: 0 - currentHP: 0 - attackPower: 0 defencePower: 10 - monsterSkillID: 0 - patrolRange: 0 - detectionRange: 0 - chaseRange: 0 - speed: 3 - attackRange: 0 _spriteRenderer: {fileID: 1562141709563587999} + _textState: {fileID: 0} _target: {fileID: 0} _collider: {fileID: 9169777540349070535} _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 1f3e02d8..a47ba418 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/RedWerevolf.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/RedWerevolf.prefab @@ -174,7 +174,7 @@ GameObject: - component: {fileID: 2474930132928432048} - component: {fileID: 6910436817492537019} - component: {fileID: 4822655698849836452} - - component: {fileID: 1303515957205445012} + - component: {fileID: 4304517482151251818} - component: {fileID: 8833145604824578523} - component: {fileID: 163468547258960914} - component: {fileID: 4902979615003904320} @@ -284,8 +284,8 @@ MonoBehaviour: m_labelHash: 1.3971405e-28 m_SpriteKey: 0 m_SpriteHash: 163368403 ---- !u!61 &1303515957205445012 -BoxCollider2D: +--- !u!70 &4304517482151251818 +CapsuleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -293,7 +293,7 @@ BoxCollider2D: m_GameObject: {fileID: 4065015762365064119} m_Enabled: 1 m_Density: 1 - m_Material: {fileID: 6200000, guid: 4b1c6f7475961704286628d9fc21c1f2, type: 2} + m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 m_Bits: 0 @@ -316,19 +316,9 @@ BoxCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0, y: 1.3125} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0} - oldSize: {x: 8, y: 8} - newSize: {x: 8, y: 8} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 2, y: 2.5} - m_EdgeRadius: 0 + m_Offset: {x: 0, y: 1.5} + m_Size: {x: 3, y: 3.2} + m_Direction: 0 --- !u!50 &8833145604824578523 Rigidbody2D: serializedVersion: 4 @@ -343,7 +333,7 @@ Rigidbody2D: m_UseAutoMass: 0 m_Mass: 1 m_LinearDrag: 0 - m_AngularDrag: 0.05 + m_AngularDrag: 10 m_GravityScale: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -390,36 +380,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: id: 0 - monsterName: - level: 0 - currentHP: 0 - attackPower: 0 defencePower: 10 - monsterSkillID: 0 - patrolRange: 0 - detectionRange: 0 - chaseRange: 0 - speed: 3 - attackRange: 0 _spriteRenderer: {fileID: 2474930132928432048} + _textState: {fileID: 0} _target: {fileID: 0} _collider: {fileID: 1095721570886575037} _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} From ff2e263791092cfa8dab5db1af4e172707017d29 Mon Sep 17 00:00:00 2001 From: uparupa95 Date: Thu, 20 Feb 2025 21:04:51 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EC=8A=A4=ED=85=8C=EC=9D=B4=EC=A7=80=201=20?= =?UTF-8?q?=ED=83=80=EC=9D=BC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tiles/Assets/Assets.png.meta | 14 +- .../Assets/Gameton/Scenes/Stage 1.unity | 218 ++++++++++-------- 2 files changed, 131 insertions(+), 101 deletions(-) diff --git a/Gameton-06/Assets/Gameton/Art/Map/Legacy_Adventure_Pack_Grassland/Tiles/Assets/Assets.png.meta b/Gameton-06/Assets/Gameton/Art/Map/Legacy_Adventure_Pack_Grassland/Tiles/Assets/Assets.png.meta index 38a9d0cd..ad2c7106 100644 --- a/Gameton-06/Assets/Gameton/Art/Map/Legacy_Adventure_Pack_Grassland/Tiles/Assets/Assets.png.meta +++ b/Gameton-06/Assets/Gameton/Art/Map/Legacy_Adventure_Pack_Grassland/Tiles/Assets/Assets.png.meta @@ -445,8 +445,9 @@ TextureImporter: border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: - - - {x: -7, y: 8} - - {x: -7, y: -8} + - - {x: -6, y: 8} + - {x: -8, y: 6} + - {x: -8, y: -8} - {x: 8, y: -8} - {x: 8, y: 8} tessellationDetail: 0 @@ -539,7 +540,8 @@ TextureImporter: physicsShape: - - {x: -8, y: 8} - {x: -8, y: -8} - - {x: 6, y: -8} + - {x: 8, y: -8} + - {x: 8, y: 6} - {x: 6, y: 8} tessellationDetail: 0 bones: [] @@ -903,7 +905,11 @@ TextureImporter: pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] - physicsShape: [] + physicsShape: + - - {x: -8, y: 8} + - {x: -8, y: -8} + - {x: 8, y: -8} + - {x: 8, y: 8} tessellationDetail: 0 bones: [] spriteID: 4670c3a90de62cb488fd521d15b05084 diff --git a/Gameton-06/Assets/Gameton/Scenes/Stage 1.unity b/Gameton-06/Assets/Gameton/Scenes/Stage 1.unity index 6ea3200a..521fbed8 100644 --- a/Gameton-06/Assets/Gameton/Scenes/Stage 1.unity +++ b/Gameton-06/Assets/Gameton/Scenes/Stage 1.unity @@ -58852,7 +58852,7 @@ Transform: m_GameObject: {fileID: 1185367601} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -80.44, y: -38.899998, z: -10.076585} + m_LocalPosition: {x: -95.13507, y: -3.387968, z: -10.076585} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -103433,8 +103433,10 @@ CompositeCollider2D: Y: 10000000 - X: 560000000 Y: 0 - - X: 598750016 + - X: 600000000 Y: 0 + - X: 600000000 + Y: 8750000 - X: 598750016 Y: 10000000 - X: 570000000 @@ -103471,13 +103473,11 @@ CompositeCollider2D: Y: 5000000 - X: 440000000 Y: 0 - - X: 430624992 + - X: 431249984 Y: 0 - - X: 430624992 - Y: -625000 - - X: 440000000 - Y: -625000 - - X: 440000000 + - X: 430000000 + Y: -1250000 + - X: 430000000 Y: -10000000 - X: 450000000 Y: -10000000 @@ -103533,9 +103533,11 @@ CompositeCollider2D: Y: -1875000 - X: 660000000 Y: 0 - - X: 630625024 + - X: 631249984 Y: 0 - - X: 630625024 + - X: 630000000 + Y: -1250000 + - X: 630000000 Y: -10000000 - X: 670000000 Y: -10000000 @@ -103547,13 +103549,17 @@ CompositeCollider2D: Y: -30000000 - X: 710000000 Y: -30000000 - - - X: 358750016 - Y: 0 - - X: 320624992 - Y: 0 - - X: 320624992 - Y: -10000000 + - - X: 360000000 + Y: -1250000 - X: 358750016 + Y: 0 + - X: 321249984 + Y: 0 + - X: 320000000 + Y: -1250000 + - X: 320000000 + Y: -10000000 + - X: 360000000 Y: -10000000 - - X: 2060000000 Y: -20000000 @@ -103567,13 +103573,17 @@ CompositeCollider2D: Y: -28125000 - X: 2060000000 Y: -28125000 - - - X: 408750016 - Y: -20000000 - - X: 370624992 - Y: -20000000 - - X: 370624992 - Y: -30000000 + - - X: 410000000 + Y: -21250000 - X: 408750016 + Y: -20000000 + - X: 371249984 + Y: -20000000 + - X: 370000000 + Y: -21250000 + - X: 370000000 + Y: -30000000 + - X: 410000000 Y: -30000000 - - X: 1030000000 Y: -20000000 @@ -103601,8 +103611,10 @@ CompositeCollider2D: Y: -28125000 - - X: 320000000 Y: -40000000 - - X: 328750016 + - X: 330000000 Y: -40000000 + - X: 330000000 + Y: -31250000 - X: 328750016 Y: -30000000 - X: 260000000 @@ -103673,9 +103685,11 @@ CompositeCollider2D: Y: -58125000 - - X: 790000000 Y: -50000000 - - X: 730625024 + - X: 731249984 Y: -50000000 - - X: 730625024 + - X: 730000000 + Y: -51250000 + - X: 730000000 Y: -60000000 - X: 790000000 Y: -60000000 @@ -103693,13 +103707,17 @@ CompositeCollider2D: Y: -58125000 - - X: 460000000 Y: -70000000 - - X: 478750016 + - X: 480000000 Y: -70000000 + - X: 480000000 + Y: -61250000 - X: 478750016 Y: -60000000 - - X: 380624992 + - X: 381249984 Y: -60000000 - - X: 380624992 + - X: 380000000 + Y: -61250000 + - X: 380000000 Y: -70000000 - X: 390000000 Y: -70000000 @@ -103777,9 +103795,11 @@ CompositeCollider2D: Y: -75000000 - X: 810000000 Y: -80000000 - - X: 790625024 + - X: 791249984 Y: -80000000 - - X: 790625024 + - X: 790000000 + Y: -81250000 + - X: 790000000 Y: -90000000 - X: 800000000 Y: -90000000 @@ -103829,24 +103849,20 @@ CompositeCollider2D: Y: -90000000 - X: 730000000 Y: -80000000 - - X: 600625024 + - X: 601249984 Y: -80000000 - - X: 600625024 - Y: -90000000 - X: 600000000 - Y: -90000000 + Y: -81250000 - X: 600000000 Y: -100000000 - X: 720000000 Y: -100000000 - - X: 550000000 Y: -80000000 - - X: 470624992 + - X: 471249984 Y: -80000000 - - X: 470624992 - Y: -90000000 - X: 470000000 - Y: -90000000 + Y: -81250000 - X: 470000000 Y: -100000000 - X: 550000000 @@ -103917,8 +103933,9 @@ CompositeCollider2D: - {x: 54.000034, y: 1} - {x: 56, y: 0.9999706} - {x: 56.000034, y: 0} - - {x: 59.875004, y: 0.000029300001} - - {x: 59.87497, y: 1} + - {x: 60, y: 0.000029300001} + - {x: 59.999996, y: 0.8750076} + - {x: 59.87499, y: 1} - {x: 56.999992, y: 1.0000023} - {x: 56, y: 1.4375024} - {x: 55.562496, y: 1.8125017} @@ -103936,10 +103953,9 @@ CompositeCollider2D: - {x: 45.4375, y: 0.8124979} - {x: 45, y: 0.4999993} - {x: 43.999992, y: 0} - - {x: 43.0625, y: -0.000029300001} - - {x: 43.062527, y: -0.0625} - - {x: 44, y: -0.0625294} - - {x: 44.00003, y: -1} + - {x: 43.124992, y: -0.0000076} + - {x: 43, y: -0.1250108} + - {x: 43.00003, y: -1} - - {x: 212.375, y: 0.1875} - {x: 212.625, y: 0.2500062} - {x: 213, y: 0.68750954} @@ -103958,10 +103974,6 @@ CompositeCollider2D: - {x: 96.99997, y: 0} - {x: 92, y: -0.000029300001} - {x: 92.00003, y: -0.8125} - - - {x: 35.874973, y: -1} - - {x: 35.874973, y: 0} - - {x: 32.0625, y: -0.000029300001} - - {x: 32.062527, y: -1} - - {x: 70.99997, y: -3} - {x: 70.99997, y: -2} - {x: 69.99999, y: -1.9999979} @@ -103971,12 +103983,25 @@ CompositeCollider2D: - {x: 67, y: -0.5624976} - {x: 66.5625, y: -0.1874985} - {x: 65.99999, y: 0} - - {x: 63.062504, y: -0.000029300001} - - {x: 63.062534, y: -1} + - {x: 63.124992, y: -0.0000076} + - {x: 63, y: -0.1250108} + - {x: 63.000034, y: -1} - {x: 67, y: -1.0000294} - {x: 67.00003, y: -2} - {x: 69, y: -2.0000293} - {x: 69.00003, y: -3} + - - {x: 35.999973, y: -1} + - {x: 35.999992, y: -0.1249924} + - {x: 35.874992, y: 0} + - {x: 32.124992, y: -0.0000076} + - {x: 32, y: -0.1250108} + - {x: 32.00003, y: -1} + - - {x: 40.999973, y: -3} + - {x: 40.999992, y: -2.1249924} + - {x: 40.874992, y: -2} + - {x: 37.124992, y: -2.0000076} + - {x: 37, y: -2.1250107} + - {x: 37.00003, y: -3} - - {x: 205.99997, y: -2.8125} - {x: 205.99997, y: -2} - {x: 203, y: -2.0000293} @@ -103995,10 +104020,6 @@ CompositeCollider2D: - {x: 99.00001, y: -2.3125062} - {x: 99.18751, y: -2.6250033} - {x: 99.50001, y: -2.8125} - - - {x: 40.874973, y: -3} - - {x: 40.874973, y: -2} - - {x: 37.0625, y: -2.0000293} - - {x: 37.062527, y: -3} - - {x: 215.99997, y: -3.8125} - {x: 215.99997, y: -3} - {x: 212, y: -3.0000293} @@ -104013,8 +104034,9 @@ CompositeCollider2D: - {x: 87.50001, y: -3.8125} - - {x: 31.999971, y: -10} - {x: 32.00003, y: -4} - - {x: 32.875004, y: -3.999971} - - {x: 32.874973, y: -3} + - {x: 33, y: -3.999971} + - {x: 32.999992, y: -3.1249924} + - {x: 32.874992, y: -3} - {x: 25.999996, y: -3.0000012} - {x: 25.437498, y: -3.1875021} - {x: 24.999998, y: -3.500001} @@ -104043,8 +104065,19 @@ CompositeCollider2D: - {x: 105.00003, y: -5.8125} - - {x: 78.99997, y: -6} - {x: 78.99997, y: -5} - - {x: 73.0625, y: -5.000029} - - {x: 73.06254, y: -6} + - {x: 73.12499, y: -5.0000076} + - {x: 73, y: -5.125011} + - {x: 73.00003, y: -6} + - - {x: 58.99997, y: -10} + - {x: 59.000034, y: -7} + - {x: 61, y: -6.9999704} + - {x: 60.99997, y: -6} + - {x: 54.062504, y: -6.000029} + - {x: 54.062534, y: -6.0625} + - {x: 55, y: -6.0625296} + - {x: 55.000034, y: -7} + - {x: 56, y: -7.0000296} + - {x: 56.000034, y: -10} - - {x: 115.99998, y: -14} - {x: 116.00003, y: -10} - {x: 163, y: -9.99997} @@ -104071,34 +104104,23 @@ CompositeCollider2D: - {x: 82.4375, y: -7.1875024} - {x: 82, y: -7.500001} - {x: 80.99999, y: -8} - - {x: 79.0625, y: -8.00003} - - {x: 79.06254, y: -9} + - {x: 79.12499, y: -8.000008} + - {x: 79, y: -8.125011} + - {x: 79.00003, y: -9} - {x: 80, y: -9.00003} - {x: 80.00003, y: -10} - {x: 108, y: -10.00003} - {x: 108.00003, y: -14} - - - {x: 58.99997, y: -10} - - {x: 59.000034, y: -7} - - {x: 61, y: -6.9999704} - - {x: 60.99997, y: -6} - - {x: 54.062504, y: -6.000029} - - {x: 54.062534, y: -6.0625} - - {x: 55, y: -6.0625296} - - {x: 55.000034, y: -7} - - {x: 56, y: -7.0000296} - - {x: 56.000034, y: -10} - - {x: 45.999973, y: -10} - {x: 46.00003, y: -7} - - {x: 47.875004, y: -6.9999704} - - {x: 47.874973, y: -6} - - {x: 38.0625, y: -6.000029} - - {x: 38.062527, y: -7} + - {x: 48, y: -6.9999704} + - {x: 47.999992, y: -6.1249924} + - {x: 47.874992, y: -6} + - {x: 38.124992, y: -6.0000076} + - {x: 38, y: -6.125011} + - {x: 38.00003, y: -7} - {x: 39, y: -7.0000296} - {x: 39.00003, y: -10} - - - {x: -15.000029, y: -10} - - {x: -15.000029, y: -8} - - {x: -18, y: -8.00003} - - {x: -17.999971, y: -10} - - {x: 229.99997, y: -10} - {x: 229.99997, y: -8} - {x: 203, y: -8.00003} @@ -104107,28 +104129,30 @@ CompositeCollider2D: - {x: 196.99997, y: -8} - {x: 195, y: -8.00003} - {x: 195.00003, y: -10} - - - {x: 179.99997, y: -10} - - {x: 179.99997, y: -8} - - {x: 175, y: -8.00003} - - {x: 175.00003, y: -10} - - - {x: 54.99997, y: -10} - - {x: 54.99997, y: -8} - - {x: 47.0625, y: -8.00003} - - {x: 47.06247, y: -9} - - {x: 47, y: -9.00003} - - {x: 47.00003, y: -10} - - {x: 71.99997, y: -10} - {x: 72.00003, y: -9} - {x: 73, y: -8.99997} - {x: 72.99997, y: -8} - - {x: 60.062504, y: -8.00003} - - {x: 60.06247, y: -9} - - {x: 60, y: -9.00003} + - {x: 60.124992, y: -8.000008} + - {x: 60, y: -8.125011} - {x: 60.000034, y: -10} + - - {x: 54.99997, y: -10} + - {x: 54.99997, y: -8} + - {x: 47.124992, y: -8.000008} + - {x: 47, y: -8.125011} + - {x: 47.00003, y: -10} + - - {x: 179.99997, y: -10} + - {x: 179.99997, y: -8} + - {x: 175, y: -8.00003} + - {x: 175.00003, y: -10} - - {x: 8.99997, y: -10} - {x: 8.99997, y: -8} - {x: -7, y: -8.00003} - {x: -6.9999704, y: -10} + - - {x: -15.000029, y: -10} + - {x: -15.000029, y: -8} + - {x: -18, y: -8.00003} + - {x: -17.999971, y: -10} - - {x: 115, y: -12.99997} - {x: 109, y: -12.99997} - {x: 109.00008, y: -8.5001545} @@ -109909,8 +109933,8 @@ Tilemap: - first: {x: 43, y: -1, z: 0} second: serializedVersion: 2 - m_TileIndex: 21 - m_TileSpriteIndex: 21 + m_TileIndex: 10 + m_TileSpriteIndex: 10 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -112568,7 +112592,7 @@ Tilemap: m_Data: {fileID: 11400000, guid: b4cb0da638a03824a93556d6bc1d1c72, type: 2} - m_RefCount: 5 m_Data: {fileID: 11400000, guid: 9b663793dffdb9d4698cfdd6084e98d9, type: 2} - - m_RefCount: 8 + - m_RefCount: 9 m_Data: {fileID: 11400000, guid: 3ca234345bb4e9740bf9a84508e3deec, type: 2} - m_RefCount: 0 m_Data: {fileID: 0} @@ -112590,7 +112614,7 @@ Tilemap: m_Data: {fileID: 11400000, guid: c6bc95a57e0b80848b23f7e0e8412b16, type: 2} - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 2 + - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 19173b178ede00541a129ddbcc5f5209, type: 2} - m_RefCount: 6 m_Data: {fileID: 11400000, guid: 5834a456e07e0d54fa0b38827a48a378, type: 2} @@ -112683,7 +112707,7 @@ Tilemap: m_Data: {fileID: 170735088, guid: 28a383233ade13e408a2af527bb1c577, type: 3} - m_RefCount: 5 m_Data: {fileID: -1005820898, guid: 28a383233ade13e408a2af527bb1c577, type: 3} - - m_RefCount: 8 + - m_RefCount: 9 m_Data: {fileID: -491406006, guid: 28a383233ade13e408a2af527bb1c577, type: 3} - m_RefCount: 0 m_Data: {fileID: 0} @@ -112705,7 +112729,7 @@ Tilemap: m_Data: {fileID: 254091482, guid: 28a383233ade13e408a2af527bb1c577, type: 3} - m_RefCount: 6 m_Data: {fileID: -588100007, guid: 28a383233ade13e408a2af527bb1c577, type: 3} - - m_RefCount: 2 + - m_RefCount: 1 m_Data: {fileID: -571363403, guid: 28a383233ade13e408a2af527bb1c577, type: 3} - m_RefCount: 6 m_Data: {fileID: -972857971, guid: 28a383233ade13e408a2af527bb1c577, type: 3}