From 69cd25fc14e9af50671a28b842f1a1efc1bd72d5 Mon Sep 17 00:00:00 2001 From: Ino Date: Mon, 9 Jun 2025 16:22:19 +0900 Subject: [PATCH] =?UTF-8?q?=ED=94=8C=EB=9D=BC=EC=9B=8C=20=EB=93=9C?= =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EC=96=B4=EB=93=9C=20=EC=8A=A4=ED=82=AC2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...refab => Effect_FlowerDryad_Skill2.prefab} | 55 +++--- ... => Effect_FlowerDryad_Skill2.prefab.meta} | 0 ... Effect_FlowerDryad_Skill2Charging.prefab} | 2 +- ...ct_FlowerDryad_Skill2Charging.prefab.meta} | 0 .../Effect_FlowerDryad_skill2_1.prefab.meta | 9 - .../Effect/Effect_FlowerDryad_skill2_2.prefab | 124 ------------- .../BossFlowerDryad_Skill2_Indicator.prefab | 170 +++++++++--------- .../FieldBoss/FlowerDryad_Skill2.prefab | 8 +- .../Character/Mob/Boss/Boss_FlowerDryad.cs | 13 +- 9 files changed, 138 insertions(+), 243 deletions(-) rename Assets/Res_Addr/Effect/{Effect_FlowerDryad_skill2_1.prefab => Effect_FlowerDryad_Skill2.prefab} (60%) rename Assets/Res_Addr/Effect/{Effect_FlowerDryad_skill2_2.prefab.meta => Effect_FlowerDryad_Skill2.prefab.meta} (100%) rename Assets/Res_Addr/Effect/{Effect_FlowerDryad_Charging.prefab => Effect_FlowerDryad_Skill2Charging.prefab} (98%) rename Assets/Res_Addr/Effect/{Effect_FlowerDryad_Charging.prefab.meta => Effect_FlowerDryad_Skill2Charging.prefab.meta} (100%) delete mode 100644 Assets/Res_Addr/Effect/Effect_FlowerDryad_skill2_1.prefab.meta delete mode 100644 Assets/Res_Addr/Effect/Effect_FlowerDryad_skill2_2.prefab diff --git a/Assets/Res_Addr/Effect/Effect_FlowerDryad_skill2_1.prefab b/Assets/Res_Addr/Effect/Effect_FlowerDryad_Skill2.prefab similarity index 60% rename from Assets/Res_Addr/Effect/Effect_FlowerDryad_skill2_1.prefab rename to Assets/Res_Addr/Effect/Effect_FlowerDryad_Skill2.prefab index a8d8efce6..2da01fbdf 100644 --- a/Assets/Res_Addr/Effect/Effect_FlowerDryad_skill2_1.prefab +++ b/Assets/Res_Addr/Effect/Effect_FlowerDryad_Skill2.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 4504870314295858} - component: {fileID: 5721183518784682466} m_Layer: 0 - m_Name: Effect_FlowerDryad_skill2_1 + m_Name: Effect_FlowerDryad_Skill2 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -30,7 +30,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 4426655926720941057} + - {fileID: 4627521940406557498} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5721183518784682466 @@ -48,7 +48,7 @@ MonoBehaviour: NoUseParticleTime: 1 OffTime: 3 e_EffectLocation: 2 ---- !u!1001 &73271959658643332 +--- !u!1001 &2488598942055052483 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -56,69 +56,84 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 4504870314295858} m_Modifications: - - target: {fileID: 4353560722159399810, guid: 44041482d8efa37429c6834fc46d2047, + - target: {fileID: 7111470932628664313, guid: 5d55615a23db03f468b6720772834d88, type: 3} - propertyPath: m_Name - value: FX_splash_gas_air + propertyPath: m_LocalScale.x + value: 5 objectReference: {fileID: 0} - - target: {fileID: 4353560722159399813, guid: 44041482d8efa37429c6834fc46d2047, + - target: {fileID: 7111470932628664313, guid: 5d55615a23db03f468b6720772834d88, + type: 3} + propertyPath: m_LocalScale.y + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7111470932628664313, guid: 5d55615a23db03f468b6720772834d88, + type: 3} + propertyPath: m_LocalScale.z + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7111470932628664313, guid: 5d55615a23db03f468b6720772834d88, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4353560722159399813, guid: 44041482d8efa37429c6834fc46d2047, + - target: {fileID: 7111470932628664313, guid: 5d55615a23db03f468b6720772834d88, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4353560722159399813, guid: 44041482d8efa37429c6834fc46d2047, + - target: {fileID: 7111470932628664313, guid: 5d55615a23db03f468b6720772834d88, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4353560722159399813, guid: 44041482d8efa37429c6834fc46d2047, + - target: {fileID: 7111470932628664313, guid: 5d55615a23db03f468b6720772834d88, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4353560722159399813, guid: 44041482d8efa37429c6834fc46d2047, + - target: {fileID: 7111470932628664313, guid: 5d55615a23db03f468b6720772834d88, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4353560722159399813, guid: 44041482d8efa37429c6834fc46d2047, + - target: {fileID: 7111470932628664313, guid: 5d55615a23db03f468b6720772834d88, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4353560722159399813, guid: 44041482d8efa37429c6834fc46d2047, + - target: {fileID: 7111470932628664313, guid: 5d55615a23db03f468b6720772834d88, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4353560722159399813, guid: 44041482d8efa37429c6834fc46d2047, + - target: {fileID: 7111470932628664313, guid: 5d55615a23db03f468b6720772834d88, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4353560722159399813, guid: 44041482d8efa37429c6834fc46d2047, + - target: {fileID: 7111470932628664313, guid: 5d55615a23db03f468b6720772834d88, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4353560722159399813, guid: 44041482d8efa37429c6834fc46d2047, + - target: {fileID: 7111470932628664313, guid: 5d55615a23db03f468b6720772834d88, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7111470932628664318, guid: 5d55615a23db03f468b6720772834d88, + type: 3} + propertyPath: m_Name + value: HCFX_Energy_08 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 44041482d8efa37429c6834fc46d2047, type: 3} ---- !u!4 &4426655926720941057 stripped + m_SourcePrefab: {fileID: 100100000, guid: 5d55615a23db03f468b6720772834d88, type: 3} +--- !u!4 &4627521940406557498 stripped Transform: - m_CorrespondingSourceObject: {fileID: 4353560722159399813, guid: 44041482d8efa37429c6834fc46d2047, + m_CorrespondingSourceObject: {fileID: 7111470932628664313, guid: 5d55615a23db03f468b6720772834d88, type: 3} - m_PrefabInstance: {fileID: 73271959658643332} + m_PrefabInstance: {fileID: 2488598942055052483} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Res_Addr/Effect/Effect_FlowerDryad_skill2_2.prefab.meta b/Assets/Res_Addr/Effect/Effect_FlowerDryad_Skill2.prefab.meta similarity index 100% rename from Assets/Res_Addr/Effect/Effect_FlowerDryad_skill2_2.prefab.meta rename to Assets/Res_Addr/Effect/Effect_FlowerDryad_Skill2.prefab.meta diff --git a/Assets/Res_Addr/Effect/Effect_FlowerDryad_Charging.prefab b/Assets/Res_Addr/Effect/Effect_FlowerDryad_Skill2Charging.prefab similarity index 98% rename from Assets/Res_Addr/Effect/Effect_FlowerDryad_Charging.prefab rename to Assets/Res_Addr/Effect/Effect_FlowerDryad_Skill2Charging.prefab index 46eb81090..3a9a61e0c 100644 --- a/Assets/Res_Addr/Effect/Effect_FlowerDryad_Charging.prefab +++ b/Assets/Res_Addr/Effect/Effect_FlowerDryad_Skill2Charging.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 4504870314295858} - component: {fileID: 5721183518784682466} m_Layer: 0 - m_Name: Effect_FlowerDryad_Charging + m_Name: Effect_FlowerDryad_Skill2Charging m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Res_Addr/Effect/Effect_FlowerDryad_Charging.prefab.meta b/Assets/Res_Addr/Effect/Effect_FlowerDryad_Skill2Charging.prefab.meta similarity index 100% rename from Assets/Res_Addr/Effect/Effect_FlowerDryad_Charging.prefab.meta rename to Assets/Res_Addr/Effect/Effect_FlowerDryad_Skill2Charging.prefab.meta diff --git a/Assets/Res_Addr/Effect/Effect_FlowerDryad_skill2_1.prefab.meta b/Assets/Res_Addr/Effect/Effect_FlowerDryad_skill2_1.prefab.meta deleted file mode 100644 index bf2e9b529..000000000 --- a/Assets/Res_Addr/Effect/Effect_FlowerDryad_skill2_1.prefab.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 9b67d9caed5b76e4ea390ffeb481753e -timeCreated: 1587080156 -licenseType: Store -NativeFormatImporter: - mainObjectFileID: 100100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Res_Addr/Effect/Effect_FlowerDryad_skill2_2.prefab b/Assets/Res_Addr/Effect/Effect_FlowerDryad_skill2_2.prefab deleted file mode 100644 index 46202a6b2..000000000 --- a/Assets/Res_Addr/Effect/Effect_FlowerDryad_skill2_2.prefab +++ /dev/null @@ -1,124 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &1380238739168988 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4504870314295858} - - component: {fileID: 5721183518784682466} - m_Layer: 0 - m_Name: Effect_FlowerDryad_skill2_2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4504870314295858 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1380238739168988} - serializedVersion: 2 - 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: 6649559275502317181} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &5721183518784682466 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1380238739168988} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 456d2bd1c5c2e5e4b8b948836c4975a4, type: 3} - m_Name: - m_EditorClassIdentifier: - NoUseParticleTime: 1 - OffTime: 3 - e_EffectLocation: 2 ---- !u!1001 &7640632758237589670 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 4504870314295858} - m_Modifications: - - target: {fileID: 3913348719244664539, guid: 3d1599c4fe4f27c4899ef6bd9810fc05, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3913348719244664539, guid: 3d1599c4fe4f27c4899ef6bd9810fc05, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3913348719244664539, guid: 3d1599c4fe4f27c4899ef6bd9810fc05, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3913348719244664539, guid: 3d1599c4fe4f27c4899ef6bd9810fc05, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3913348719244664539, guid: 3d1599c4fe4f27c4899ef6bd9810fc05, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3913348719244664539, guid: 3d1599c4fe4f27c4899ef6bd9810fc05, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3913348719244664539, guid: 3d1599c4fe4f27c4899ef6bd9810fc05, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3913348719244664539, guid: 3d1599c4fe4f27c4899ef6bd9810fc05, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3913348719244664539, guid: 3d1599c4fe4f27c4899ef6bd9810fc05, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3913348719244664539, guid: 3d1599c4fe4f27c4899ef6bd9810fc05, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3913348719244664540, guid: 3d1599c4fe4f27c4899ef6bd9810fc05, - type: 3} - propertyPath: m_Name - value: FX_splash_gas_floor - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 3d1599c4fe4f27c4899ef6bd9810fc05, type: 3} ---- !u!4 &6649559275502317181 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3913348719244664539, guid: 3d1599c4fe4f27c4899ef6bd9810fc05, - type: 3} - m_PrefabInstance: {fileID: 7640632758237589670} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/Res_Addr/Obj/BossFlowerDryad_Skill2_Indicator.prefab b/Assets/Res_Addr/Obj/BossFlowerDryad_Skill2_Indicator.prefab index 94c2cb02e..d40f15ed6 100644 --- a/Assets/Res_Addr/Obj/BossFlowerDryad_Skill2_Indicator.prefab +++ b/Assets/Res_Addr/Obj/BossFlowerDryad_Skill2_Indicator.prefab @@ -29,89 +29,97 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 8326439282713650963} + - {fileID: 3686641818865194913} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &6103245381572497025 -GameObject: +--- !u!1001 &3685658437211101275 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8326439282713650963} - - component: {fileID: 5103927069348011261} - - component: {fileID: 3407844307912350546} - m_Layer: 3 - m_Name: Indicator - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8326439282713650963 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6103245381572497025} serializedVersion: 2 - m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 15, y: 15, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 476427145400443123} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &5103927069348011261 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 476427145400443123} + m_Modifications: + - target: {fileID: 1173698457435006, guid: a93b07a8595bb0145bc3af1e9911c409, type: 3} + propertyPath: m_Name + value: Marker 7 Danger zone + objectReference: {fileID: 0} + - target: {fileID: 4367129774968826, guid: a93b07a8595bb0145bc3af1e9911c409, type: 3} + propertyPath: m_LocalScale.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4367129774968826, guid: a93b07a8595bb0145bc3af1e9911c409, type: 3} + propertyPath: m_LocalScale.z + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4367129774968826, guid: a93b07a8595bb0145bc3af1e9911c409, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4367129774968826, guid: a93b07a8595bb0145bc3af1e9911c409, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4367129774968826, guid: a93b07a8595bb0145bc3af1e9911c409, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4367129774968826, guid: a93b07a8595bb0145bc3af1e9911c409, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4367129774968826, guid: a93b07a8595bb0145bc3af1e9911c409, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4367129774968826, guid: a93b07a8595bb0145bc3af1e9911c409, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4367129774968826, guid: a93b07a8595bb0145bc3af1e9911c409, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4367129774968826, guid: a93b07a8595bb0145bc3af1e9911c409, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4367129774968826, guid: a93b07a8595bb0145bc3af1e9911c409, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4367129774968826, guid: a93b07a8595bb0145bc3af1e9911c409, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 198706515776294966, guid: a93b07a8595bb0145bc3af1e9911c409, + type: 3} + propertyPath: lengthInSec + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 198706515776294966, guid: a93b07a8595bb0145bc3af1e9911c409, + type: 3} + propertyPath: InitialModule.startLifetime.scalar + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 198980401682514854, guid: a93b07a8595bb0145bc3af1e9911c409, + type: 3} + propertyPath: lengthInSec + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 198980401682514854, guid: a93b07a8595bb0145bc3af1e9911c409, + type: 3} + propertyPath: InitialModule.startLifetime.scalar + value: 2.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a93b07a8595bb0145bc3af1e9911c409, type: 3} +--- !u!4 &3686641818865194913 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4367129774968826, guid: a93b07a8595bb0145bc3af1e9911c409, + type: 3} + m_PrefabInstance: {fileID: 3685658437211101275} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6103245381572497025} - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &3407844307912350546 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6103245381572497025} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 3e1c80888ebc582469572ddac13cc967, type: 2} - 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: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} diff --git a/Assets/Res_Addr/Projectile/FieldBoss/FlowerDryad_Skill2.prefab b/Assets/Res_Addr/Projectile/FieldBoss/FlowerDryad_Skill2.prefab index a87fb015d..a0646b2b0 100644 --- a/Assets/Res_Addr/Projectile/FieldBoss/FlowerDryad_Skill2.prefab +++ b/Assets/Res_Addr/Projectile/FieldBoss/FlowerDryad_Skill2.prefab @@ -10,7 +10,7 @@ GameObject: m_Component: - component: {fileID: 7700533061093772912} - component: {fileID: 133627927221610667} - - component: {fileID: -5702343879196299615} + - component: {fileID: 6458577928842872482} m_Layer: 0 m_Name: FlowerDryad_Skill2 m_TagString: Untagged @@ -51,8 +51,8 @@ MonoBehaviour: str_HitEffect: m_ShowTimeOverEffect: 0 ShowTarget: 0 ---- !u!65 &-5702343879196299615 -BoxCollider: +--- !u!135 &6458577928842872482 +SphereCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -70,7 +70,7 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 15, y: 2, z: 15} + m_Radius: 7.25 m_Center: {x: 0, y: 0, z: 0} --- !u!1001 &8197565808657702883 PrefabInstance: diff --git a/Assets/Script/Character/Mob/Boss/Boss_FlowerDryad.cs b/Assets/Script/Character/Mob/Boss/Boss_FlowerDryad.cs index b397edb0f..7ffb8d5a2 100644 --- a/Assets/Script/Character/Mob/Boss/Boss_FlowerDryad.cs +++ b/Assets/Script/Character/Mob/Boss/Boss_FlowerDryad.cs @@ -33,6 +33,8 @@ public class Boss_FlowerDryad : BossMobActor public float Skill2PoisonGapTime = 1f; [Header("스킬2 독 데미지")] public float Skill2PoisonDmg = .3f; + [Header("스킬2 에어본 지속 시간")] + public float Skill2AirborneTime = 1.5f; SkillListTableData m_Poison = new SkillListTableData { e_SkillExtraType = eSkillExtraType.Poison, f_ExtraValue4 = 1f }; @@ -49,8 +51,8 @@ public class Boss_FlowerDryad : BossMobActor CoolTime_Skill1 = 1f; CoolTime_Skill2 = 2f; - //CoolTime_Skill1 = 10000f; - CoolTime_Skill2 = 20000f; + CoolTime_Skill1 = 10000f; + //CoolTime_Skill2 = 20000f; } protected override void Init(bool initSkill1CoolTime, bool initSkill2CoolTime) @@ -103,12 +105,14 @@ public class Boss_FlowerDryad : BossMobActor AnimationPlay("boss_skill2"); dic_indicator[0].SetActive(true); dic_indicator[0].transform.position = Get_position(); - InGameInfo.Ins.Show_Effect("Effect_FlowerDryad_Charging", Get_position()); + InGameInfo.Ins.Show_Effect("Effect_FlowerDryad_Skill2Charging", Get_position()); yield return new WaitForSeconds(Skill2ChargingTime); dic_indicator[0].SetActive(false); AnimationPlay("boss_skill2attack"); - InGameInfo.Ins.Show_Effect($"Effect_FlowerDryad_skill2_{Random.Range(1, 3)}", Get_position()); + + yield return new WaitForSeconds(0.1f); + InGameInfo.Ins.Show_Effect("Effect_FlowerDryad_Skill2", this, eEffectLocation.Bottom, m_MonsterTableData.f_ProjectileLifeTime3); yield return new WaitForSeconds(3f); Check_Battle(); @@ -122,5 +126,6 @@ public class Boss_FlowerDryad : BossMobActor pd.e_SkillExtraType = m_Poison.e_SkillExtraType; pd.m_skillTypeConfigTable = table_skilltypeconfig.Ins.Get_Data_orNull(pd.e_SkillExtraType); pd.m_SkillListTableData = m_Poison; + pd.Action_OnHit = hitter => { hitter.KnockedAirborne(Skill2AirborneTime); }; } } \ No newline at end of file