From ca023dcf08378cd8c22a2ccc39ccbffe0e42562a Mon Sep 17 00:00:00 2001 From: Ino Date: Wed, 9 Apr 2025 11:29:05 +0900 Subject: [PATCH] shaga --- .../Effect/Effect_Hit_Shaga_Attack.prefab | 139 +++++++++++++ .../Effect_Hit_Shaga_Attack.prefab.meta | 7 + .../Effect/Effect_Shaga_Charging.prefab | 137 ++++--------- .../Effect/Effect_Shaga_Summon.prefab | 184 ++++++++++++++++++ .../Effect/Effect_Shaga_Summon.prefab.meta | 9 + .../Projectile/FieldBoss/Shaga_Attack.prefab | 51 +++-- .../Script/Character/Mob/Boss/Boss_Shaga.cs | 6 +- 7 files changed, 400 insertions(+), 133 deletions(-) create mode 100644 Assets/Res_Addr/Effect/Effect_Hit_Shaga_Attack.prefab create mode 100644 Assets/Res_Addr/Effect/Effect_Hit_Shaga_Attack.prefab.meta create mode 100644 Assets/Res_Addr/Effect/Effect_Shaga_Summon.prefab create mode 100644 Assets/Res_Addr/Effect/Effect_Shaga_Summon.prefab.meta diff --git a/Assets/Res_Addr/Effect/Effect_Hit_Shaga_Attack.prefab b/Assets/Res_Addr/Effect/Effect_Hit_Shaga_Attack.prefab new file mode 100644 index 000000000..3f2eaa5e0 --- /dev/null +++ b/Assets/Res_Addr/Effect/Effect_Hit_Shaga_Attack.prefab @@ -0,0 +1,139 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6447539369536475508 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7194714384950255132} + - component: {fileID: 4401709382025590213} + m_Layer: 0 + m_Name: Effect_Hit_Shaga_Attack + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7194714384950255132 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6447539369536475508} + 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: 952560625132936102} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4401709382025590213 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6447539369536475508} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 456d2bd1c5c2e5e4b8b948836c4975a4, type: 3} + m_Name: + m_EditorClassIdentifier: + NoUseParticleTime: 1 + OffTime: 1 + e_EffectLocation: 0 +--- !u!1001 &3855704398428083778 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7194714384950255132} + m_Modifications: + - target: {fileID: 4087608678707170787, guid: ab6a8de2d69646a449e7455dff363051, + type: 3} + propertyPath: m_Name + value: FX_Shoot_Poison_hit + objectReference: {fileID: 0} + - target: {fileID: 4087608678707170788, guid: ab6a8de2d69646a449e7455dff363051, + type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4087608678707170788, guid: ab6a8de2d69646a449e7455dff363051, + type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4087608678707170788, guid: ab6a8de2d69646a449e7455dff363051, + type: 3} + propertyPath: m_LocalScale.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4087608678707170788, guid: ab6a8de2d69646a449e7455dff363051, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4087608678707170788, guid: ab6a8de2d69646a449e7455dff363051, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4087608678707170788, guid: ab6a8de2d69646a449e7455dff363051, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4087608678707170788, guid: ab6a8de2d69646a449e7455dff363051, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4087608678707170788, guid: ab6a8de2d69646a449e7455dff363051, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4087608678707170788, guid: ab6a8de2d69646a449e7455dff363051, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4087608678707170788, guid: ab6a8de2d69646a449e7455dff363051, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4087608678707170788, guid: ab6a8de2d69646a449e7455dff363051, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4087608678707170788, guid: ab6a8de2d69646a449e7455dff363051, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4087608678707170788, guid: ab6a8de2d69646a449e7455dff363051, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ab6a8de2d69646a449e7455dff363051, type: 3} +--- !u!4 &952560625132936102 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4087608678707170788, guid: ab6a8de2d69646a449e7455dff363051, + type: 3} + m_PrefabInstance: {fileID: 3855704398428083778} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Res_Addr/Effect/Effect_Hit_Shaga_Attack.prefab.meta b/Assets/Res_Addr/Effect/Effect_Hit_Shaga_Attack.prefab.meta new file mode 100644 index 000000000..457dfa800 --- /dev/null +++ b/Assets/Res_Addr/Effect/Effect_Hit_Shaga_Attack.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c4692367bd3298f46ad7081c927b580a +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Res_Addr/Effect/Effect_Shaga_Charging.prefab b/Assets/Res_Addr/Effect/Effect_Shaga_Charging.prefab index fd5eb997f..c2fc51999 100644 --- a/Assets/Res_Addr/Effect/Effect_Shaga_Charging.prefab +++ b/Assets/Res_Addr/Effect/Effect_Shaga_Charging.prefab @@ -30,7 +30,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 4366480109533765599} + - {fileID: 5881418590906224453} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5721183518784682466 @@ -48,7 +48,7 @@ MonoBehaviour: NoUseParticleTime: 1 OffTime: 5 e_EffectLocation: 2 ---- !u!1001 &4366018842028703375 +--- !u!1001 &7807891231277919646 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -56,138 +56,69 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 4504870314295858} m_Modifications: - - target: {fileID: 1182614328576822, guid: 1205099e4d473fd46a9de5fcc1037aaa, type: 3} + - target: {fileID: 4451188901321450200, guid: 5ce6cc67dc61e344b97619ac6f58b70b, + type: 3} propertyPath: m_Name - value: Magic circle 9 + value: HCFX_ElementOrb_04 objectReference: {fileID: 0} - - target: {fileID: 4483290175758672, guid: 1205099e4d473fd46a9de5fcc1037aaa, type: 3} - propertyPath: m_LocalScale.x - value: 1.1 - objectReference: {fileID: 0} - - target: {fileID: 4483290175758672, guid: 1205099e4d473fd46a9de5fcc1037aaa, type: 3} - propertyPath: m_LocalScale.y - value: 1.1 - objectReference: {fileID: 0} - - target: {fileID: 4483290175758672, guid: 1205099e4d473fd46a9de5fcc1037aaa, type: 3} - propertyPath: m_LocalScale.z - value: 1.1 - objectReference: {fileID: 0} - - target: {fileID: 4483290175758672, guid: 1205099e4d473fd46a9de5fcc1037aaa, type: 3} + - target: {fileID: 4451188901321450203, guid: 5ce6cc67dc61e344b97619ac6f58b70b, + type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4483290175758672, guid: 1205099e4d473fd46a9de5fcc1037aaa, type: 3} + - target: {fileID: 4451188901321450203, guid: 5ce6cc67dc61e344b97619ac6f58b70b, + type: 3} propertyPath: m_LocalPosition.y - value: 0.01 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4483290175758672, guid: 1205099e4d473fd46a9de5fcc1037aaa, type: 3} + - target: {fileID: 4451188901321450203, guid: 5ce6cc67dc61e344b97619ac6f58b70b, + type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4483290175758672, guid: 1205099e4d473fd46a9de5fcc1037aaa, type: 3} + - target: {fileID: 4451188901321450203, guid: 5ce6cc67dc61e344b97619ac6f58b70b, + type: 3} propertyPath: m_LocalRotation.w - value: 0.7071068 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 4483290175758672, guid: 1205099e4d473fd46a9de5fcc1037aaa, type: 3} + - target: {fileID: 4451188901321450203, guid: 5ce6cc67dc61e344b97619ac6f58b70b, + type: 3} propertyPath: m_LocalRotation.x - value: -0.7071068 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4483290175758672, guid: 1205099e4d473fd46a9de5fcc1037aaa, type: 3} + - target: {fileID: 4451188901321450203, guid: 5ce6cc67dc61e344b97619ac6f58b70b, + type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4483290175758672, guid: 1205099e4d473fd46a9de5fcc1037aaa, type: 3} + - target: {fileID: 4451188901321450203, guid: 5ce6cc67dc61e344b97619ac6f58b70b, + type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4483290175758672, guid: 1205099e4d473fd46a9de5fcc1037aaa, type: 3} + - target: {fileID: 4451188901321450203, guid: 5ce6cc67dc61e344b97619ac6f58b70b, + type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -90 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4483290175758672, guid: 1205099e4d473fd46a9de5fcc1037aaa, type: 3} + - target: {fileID: 4451188901321450203, guid: 5ce6cc67dc61e344b97619ac6f58b70b, + type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4483290175758672, guid: 1205099e4d473fd46a9de5fcc1037aaa, type: 3} + - target: {fileID: 4451188901321450203, guid: 5ce6cc67dc61e344b97619ac6f58b70b, + type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 199379528672491648, guid: 1205099e4d473fd46a9de5fcc1037aaa, - type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 199401829107614472, guid: 1205099e4d473fd46a9de5fcc1037aaa, - type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 199463191918037300, guid: 1205099e4d473fd46a9de5fcc1037aaa, - type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 199536910430389618, guid: 1205099e4d473fd46a9de5fcc1037aaa, - type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 199628691627704018, guid: 1205099e4d473fd46a9de5fcc1037aaa, - type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 199807678022466288, guid: 1205099e4d473fd46a9de5fcc1037aaa, - type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 199874118704243784, guid: 1205099e4d473fd46a9de5fcc1037aaa, - type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 1556889908395958, guid: 1205099e4d473fd46a9de5fcc1037aaa, - type: 3} - insertIndex: -1 - addedObject: {fileID: 4365948904870425693} - m_SourcePrefab: {fileID: 100100000, guid: 1205099e4d473fd46a9de5fcc1037aaa, type: 3} ---- !u!1 &4364745579284775225 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1556889908395958, guid: 1205099e4d473fd46a9de5fcc1037aaa, - type: 3} - m_PrefabInstance: {fileID: 4366018842028703375} - m_PrefabAsset: {fileID: 0} ---- !u!114 &4365948904870425693 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4364745579284775225} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Version: 3 - m_UsePipelineSettings: 1 - m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 - m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 - m_LightCookieSize: {x: 1, y: 1} - m_LightCookieOffset: {x: 0, y: 0} - m_SoftShadowQuality: 0 ---- !u!4 &4366480109533765599 stripped + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5ce6cc67dc61e344b97619ac6f58b70b, type: 3} +--- !u!4 &5881418590906224453 stripped Transform: - m_CorrespondingSourceObject: {fileID: 4483290175758672, guid: 1205099e4d473fd46a9de5fcc1037aaa, + m_CorrespondingSourceObject: {fileID: 4451188901321450203, guid: 5ce6cc67dc61e344b97619ac6f58b70b, type: 3} - m_PrefabInstance: {fileID: 4366018842028703375} + m_PrefabInstance: {fileID: 7807891231277919646} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Res_Addr/Effect/Effect_Shaga_Summon.prefab b/Assets/Res_Addr/Effect/Effect_Shaga_Summon.prefab new file mode 100644 index 000000000..0cc569d3d --- /dev/null +++ b/Assets/Res_Addr/Effect/Effect_Shaga_Summon.prefab @@ -0,0 +1,184 @@ +%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_Shaga_Summon + 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: 2232776892819611241} + 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: 1 + e_EffectLocation: 2 +--- !u!1001 &5847627758008331158 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4504870314295858} + m_Modifications: + - target: {fileID: 1576501743720616875, guid: 29812d65ebd229841a594867f93d5dcf, + type: 3} + propertyPath: InitialModule.startSize.scalar + value: 0.074 + objectReference: {fileID: 0} + - target: {fileID: 1576501743720616875, guid: 29812d65ebd229841a594867f93d5dcf, + type: 3} + propertyPath: InitialModule.startSize.minScalar + value: 0.04 + objectReference: {fileID: 0} + - target: {fileID: 1700136798105713350, guid: 29812d65ebd229841a594867f93d5dcf, + type: 3} + propertyPath: m_Name + value: PoisonExplosion + objectReference: {fileID: 0} + - target: {fileID: 2248956244997474757, guid: 29812d65ebd229841a594867f93d5dcf, + type: 3} + propertyPath: InitialModule.startSize.scalar + value: 0.938 + objectReference: {fileID: 0} + - target: {fileID: 2352124738841966415, guid: 29812d65ebd229841a594867f93d5dcf, + type: 3} + propertyPath: InitialModule.startSize.scalar + value: 0.638 + objectReference: {fileID: 0} + - target: {fileID: 2680984569169100867, guid: 29812d65ebd229841a594867f93d5dcf, + type: 3} + propertyPath: InitialModule.startSize.scalar + value: 0.984 + objectReference: {fileID: 0} + - target: {fileID: 4126019836829296996, guid: 29812d65ebd229841a594867f93d5dcf, + type: 3} + propertyPath: InitialModule.startSize.scalar + value: 0.504 + objectReference: {fileID: 0} + - target: {fileID: 5428502193004550990, guid: 29812d65ebd229841a594867f93d5dcf, + type: 3} + propertyPath: InitialModule.startSize.scalar + value: 0.972 + objectReference: {fileID: 0} + - target: {fileID: 5754079388517430783, guid: 29812d65ebd229841a594867f93d5dcf, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5754079388517430783, guid: 29812d65ebd229841a594867f93d5dcf, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5754079388517430783, guid: 29812d65ebd229841a594867f93d5dcf, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5754079388517430783, guid: 29812d65ebd229841a594867f93d5dcf, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5754079388517430783, guid: 29812d65ebd229841a594867f93d5dcf, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.15 + objectReference: {fileID: 0} + - target: {fileID: 5754079388517430783, guid: 29812d65ebd229841a594867f93d5dcf, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5754079388517430783, guid: 29812d65ebd229841a594867f93d5dcf, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5754079388517430783, guid: 29812d65ebd229841a594867f93d5dcf, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5754079388517430783, guid: 29812d65ebd229841a594867f93d5dcf, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5754079388517430783, guid: 29812d65ebd229841a594867f93d5dcf, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5754079388517430783, guid: 29812d65ebd229841a594867f93d5dcf, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5754079388517430783, guid: 29812d65ebd229841a594867f93d5dcf, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5754079388517430783, guid: 29812d65ebd229841a594867f93d5dcf, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7539695953255611376, guid: 29812d65ebd229841a594867f93d5dcf, + type: 3} + propertyPath: InitialModule.startSize.scalar + value: 0.994 + objectReference: {fileID: 0} + - target: {fileID: 9114831514063345915, guid: 29812d65ebd229841a594867f93d5dcf, + type: 3} + propertyPath: InitialModule.startSize.scalar + value: 0.912 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 29812d65ebd229841a594867f93d5dcf, type: 3} +--- !u!4 &2232776892819611241 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5754079388517430783, guid: 29812d65ebd229841a594867f93d5dcf, + type: 3} + m_PrefabInstance: {fileID: 5847627758008331158} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Res_Addr/Effect/Effect_Shaga_Summon.prefab.meta b/Assets/Res_Addr/Effect/Effect_Shaga_Summon.prefab.meta new file mode 100644 index 000000000..ea704db81 --- /dev/null +++ b/Assets/Res_Addr/Effect/Effect_Shaga_Summon.prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 94d2d608bb71d944d813706b78294b28 +timeCreated: 1587080156 +licenseType: Store +NativeFormatImporter: + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Res_Addr/Projectile/FieldBoss/Shaga_Attack.prefab b/Assets/Res_Addr/Projectile/FieldBoss/Shaga_Attack.prefab index f0f5cda4a..5c8bdea23 100644 --- a/Assets/Res_Addr/Projectile/FieldBoss/Shaga_Attack.prefab +++ b/Assets/Res_Addr/Projectile/FieldBoss/Shaga_Attack.prefab @@ -31,7 +31,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 3435209912421788877} + - {fileID: 3583984941120740457} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &-5702343879196299615 @@ -72,7 +72,7 @@ MonoBehaviour: str_HitEffect: Effect_Hit_IceGolem_Attack m_ShowTimeOverEffect: 1 m_Direction: 0 ---- !u!1001 &1964556433323407020 +--- !u!1001 &1996375549724183621 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -80,89 +80,84 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 7700533061093772912} m_Modifications: - - target: {fileID: 3814496778439236193, guid: 0e97097ebbad225488a0264463560ec6, + - target: {fileID: 3028762750161260588, guid: 082db2f7e42f95144babf5127866a2c1, type: 3} propertyPath: m_LocalScale.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 3814496778439236193, guid: 0e97097ebbad225488a0264463560ec6, + - target: {fileID: 3028762750161260588, guid: 082db2f7e42f95144babf5127866a2c1, type: 3} propertyPath: m_LocalScale.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 3814496778439236193, guid: 0e97097ebbad225488a0264463560ec6, + - target: {fileID: 3028762750161260588, guid: 082db2f7e42f95144babf5127866a2c1, type: 3} propertyPath: m_LocalScale.z value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 3814496778439236193, guid: 0e97097ebbad225488a0264463560ec6, + - target: {fileID: 3028762750161260588, guid: 082db2f7e42f95144babf5127866a2c1, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3814496778439236193, guid: 0e97097ebbad225488a0264463560ec6, + - target: {fileID: 3028762750161260588, guid: 082db2f7e42f95144babf5127866a2c1, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3814496778439236193, guid: 0e97097ebbad225488a0264463560ec6, + - target: {fileID: 3028762750161260588, guid: 082db2f7e42f95144babf5127866a2c1, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3814496778439236193, guid: 0e97097ebbad225488a0264463560ec6, + - target: {fileID: 3028762750161260588, guid: 082db2f7e42f95144babf5127866a2c1, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071068 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 3814496778439236193, guid: 0e97097ebbad225488a0264463560ec6, + - target: {fileID: 3028762750161260588, guid: 082db2f7e42f95144babf5127866a2c1, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3814496778439236193, guid: 0e97097ebbad225488a0264463560ec6, + - target: {fileID: 3028762750161260588, guid: 082db2f7e42f95144babf5127866a2c1, type: 3} propertyPath: m_LocalRotation.y - value: -0.7071068 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 3814496778439236193, guid: 0e97097ebbad225488a0264463560ec6, + - target: {fileID: 3028762750161260588, guid: 082db2f7e42f95144babf5127866a2c1, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3814496778439236193, guid: 0e97097ebbad225488a0264463560ec6, + - target: {fileID: 3028762750161260588, guid: 082db2f7e42f95144babf5127866a2c1, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3814496778439236193, guid: 0e97097ebbad225488a0264463560ec6, + - target: {fileID: 3028762750161260588, guid: 082db2f7e42f95144babf5127866a2c1, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3814496778439236193, guid: 0e97097ebbad225488a0264463560ec6, + - target: {fileID: 3028762750161260588, guid: 082db2f7e42f95144babf5127866a2c1, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3814496778439236206, guid: 0e97097ebbad225488a0264463560ec6, + - target: {fileID: 3028762750161260589, guid: 082db2f7e42f95144babf5127866a2c1, type: 3} propertyPath: m_Name - value: Projectiles_frost - objectReference: {fileID: 0} - - target: {fileID: 3814496778439236206, guid: 0e97097ebbad225488a0264463560ec6, - type: 3} - propertyPath: m_IsActive - value: 1 + value: FX_Shoot_Poison_projectile objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 0e97097ebbad225488a0264463560ec6, type: 3} ---- !u!4 &3435209912421788877 stripped + m_SourcePrefab: {fileID: 100100000, guid: 082db2f7e42f95144babf5127866a2c1, type: 3} +--- !u!4 &3583984941120740457 stripped Transform: - m_CorrespondingSourceObject: {fileID: 3814496778439236193, guid: 0e97097ebbad225488a0264463560ec6, + m_CorrespondingSourceObject: {fileID: 3028762750161260588, guid: 082db2f7e42f95144babf5127866a2c1, type: 3} - m_PrefabInstance: {fileID: 1964556433323407020} + m_PrefabInstance: {fileID: 1996375549724183621} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Script/Character/Mob/Boss/Boss_Shaga.cs b/Assets/Script/Character/Mob/Boss/Boss_Shaga.cs index 60ed53cba..8d1f6552d 100644 --- a/Assets/Script/Character/Mob/Boss/Boss_Shaga.cs +++ b/Assets/Script/Character/Mob/Boss/Boss_Shaga.cs @@ -99,7 +99,7 @@ public class Boss_Shaga : BossMobActor { Change_MobStatus(eMobStatus.Skill); AnimationPlay("boss_skill2charging"); - InGameInfo.Ins.Show_Effect("Effect_Shaga_Charging", this, eEffectLocation.Bottom, Skill2ChargingTime); + InGameInfo.Ins.Show_Effect("Effect_Shaga_Charging", this, eEffectLocation.Mid, Skill2ChargingTime); yield return new WaitForSeconds(Skill2ChargingTime); AnimationPlay("boss_skill2attack"); @@ -113,7 +113,9 @@ public class Boss_Shaga : BossMobActor AddrResourceMgr.Ins.Set_AddressableReleaseSelf(mob.gameObject); ActorInfo.Ins.Add_Actor(mob, eRole.Mob, m_MonsterAppearData.n_SpawnerID, mobData.s_MonsterPrefab); mob.Set(true, null, null, m_MonsterAppearData.n_SpawnerID, false); - mob.Set(mobData, DSUtil.Get_RandomPos_onNavMesh(Get_position(), 2f), null, 0, Skill2SummonLifeTime); + var summonpos = DSUtil.Get_RandomPos_onNavMesh(Get_position(), 2f); + mob.Set(mobData, summonpos, null, 0, Skill2SummonLifeTime); + InGameInfo.Ins.Show_Effect("Effect_Shaga_Summon", summonpos); mob.m_SubRole = eSubRol.Summon; mob.On_Regen(); mob.Get_StatInfo().Reset_byStatInfo(Get_StatInfo(), Skill2StatRate);