diff --git a/Assets/Res_Addr/Effect/Effect_Anubis_Skill1End.prefab b/Assets/Res_Addr/Effect/Effect_Anubis_Skill1End.prefab index a67d28690..d26797b71 100644 --- a/Assets/Res_Addr/Effect/Effect_Anubis_Skill1End.prefab +++ b/Assets/Res_Addr/Effect/Effect_Anubis_Skill1End.prefab @@ -69,7 +69,7 @@ PrefabInstance: - target: {fileID: 7781049213900879125, guid: 158579ddb679fe14bbb93f7ae1259d56, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7781049213900879125, guid: 158579ddb679fe14bbb93f7ae1259d56, type: 3} diff --git a/Assets/Res_Addr/Effect/Effect_Anubis_Skill1RotEnd.prefab b/Assets/Res_Addr/Effect/Effect_Anubis_Skill1RotEnd.prefab index aef5a9444..1a8ae6030 100644 --- a/Assets/Res_Addr/Effect/Effect_Anubis_Skill1RotEnd.prefab +++ b/Assets/Res_Addr/Effect/Effect_Anubis_Skill1RotEnd.prefab @@ -14905,7 +14905,7 @@ Transform: m_GameObject: {fileID: 5078807965959188009} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -1, z: 0} + m_LocalPosition: {x: 0, y: -1.25, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: diff --git a/Assets/Res_Addr/Effect/Effect_Hit_AnubisSkill1.prefab b/Assets/Res_Addr/Effect/Effect_Hit_AnubisSkill1.prefab new file mode 100644 index 000000000..b153a5fb6 --- /dev/null +++ b/Assets/Res_Addr/Effect/Effect_Hit_AnubisSkill1.prefab @@ -0,0 +1,139 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1767841913861676 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4156505390307840} + - component: {fileID: -3500030264155942338} + m_Layer: 0 + m_Name: Effect_Hit_AnubisSkill1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4156505390307840 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1767841913861676} + 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: 945290304568941483} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &-3500030264155942338 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1767841913861676} + 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 &68086673675184172 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4156505390307840} + m_Modifications: + - target: {fileID: 1004229041087787908, guid: e6eb729988ef2f349a24b0b4ae8fea47, + type: 3} + propertyPath: m_Name + value: HCFX_Hit_03 + objectReference: {fileID: 0} + - target: {fileID: 1004229041087787911, guid: e6eb729988ef2f349a24b0b4ae8fea47, + type: 3} + propertyPath: m_LocalScale.x + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 1004229041087787911, guid: e6eb729988ef2f349a24b0b4ae8fea47, + type: 3} + propertyPath: m_LocalScale.y + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 1004229041087787911, guid: e6eb729988ef2f349a24b0b4ae8fea47, + type: 3} + propertyPath: m_LocalScale.z + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 1004229041087787911, guid: e6eb729988ef2f349a24b0b4ae8fea47, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1004229041087787911, guid: e6eb729988ef2f349a24b0b4ae8fea47, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1004229041087787911, guid: e6eb729988ef2f349a24b0b4ae8fea47, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1004229041087787911, guid: e6eb729988ef2f349a24b0b4ae8fea47, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1004229041087787911, guid: e6eb729988ef2f349a24b0b4ae8fea47, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1004229041087787911, guid: e6eb729988ef2f349a24b0b4ae8fea47, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1004229041087787911, guid: e6eb729988ef2f349a24b0b4ae8fea47, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1004229041087787911, guid: e6eb729988ef2f349a24b0b4ae8fea47, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1004229041087787911, guid: e6eb729988ef2f349a24b0b4ae8fea47, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1004229041087787911, guid: e6eb729988ef2f349a24b0b4ae8fea47, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e6eb729988ef2f349a24b0b4ae8fea47, type: 3} +--- !u!4 &945290304568941483 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1004229041087787911, guid: e6eb729988ef2f349a24b0b4ae8fea47, + type: 3} + m_PrefabInstance: {fileID: 68086673675184172} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Res_Addr/Effect/Effect_Hit_AnubisSkill1.prefab.meta b/Assets/Res_Addr/Effect/Effect_Hit_AnubisSkill1.prefab.meta new file mode 100644 index 000000000..3e7941947 --- /dev/null +++ b/Assets/Res_Addr/Effect/Effect_Hit_AnubisSkill1.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f9e6cf195232038459441eb774c30f22 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Res_Addr/Effect/Effect_Hit_AnubisSkil2.prefab b/Assets/Res_Addr/Effect/Effect_Hit_AnubisSkill2.prefab similarity index 99% rename from Assets/Res_Addr/Effect/Effect_Hit_AnubisSkil2.prefab rename to Assets/Res_Addr/Effect/Effect_Hit_AnubisSkill2.prefab index c52159237..651416187 100644 --- a/Assets/Res_Addr/Effect/Effect_Hit_AnubisSkil2.prefab +++ b/Assets/Res_Addr/Effect/Effect_Hit_AnubisSkill2.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 400004} - component: {fileID: -3676690579904897150} m_Layer: 0 - m_Name: Effect_Hit_AnubisSkil2 + m_Name: Effect_Hit_AnubisSkill2 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Res_Addr/Effect/Effect_Hit_AnubisSkil2.prefab.meta b/Assets/Res_Addr/Effect/Effect_Hit_AnubisSkill2.prefab.meta similarity index 100% rename from Assets/Res_Addr/Effect/Effect_Hit_AnubisSkil2.prefab.meta rename to Assets/Res_Addr/Effect/Effect_Hit_AnubisSkill2.prefab.meta diff --git a/Assets/Res_Addr/Projectile/FieldBoss/Anubis_Skill1.prefab b/Assets/Res_Addr/Projectile/FieldBoss/Anubis_Skill1.prefab index a9117ac1a..8f48fed02 100644 --- a/Assets/Res_Addr/Projectile/FieldBoss/Anubis_Skill1.prefab +++ b/Assets/Res_Addr/Projectile/FieldBoss/Anubis_Skill1.prefab @@ -48,7 +48,7 @@ MonoBehaviour: m_EditorClassIdentifier: ColliderLayer: Actor m_Pierce: 1 - str_HitEffect: + str_HitEffect: Effect_Hit_AnubisSkill1 m_ShowTimeOverEffect: 0 m_Collider: {fileID: 8240083998892309707} HitDelayTime: 0.5 diff --git a/Assets/Res_Addr/Projectile/FieldBoss/Anubis_Skill2.prefab b/Assets/Res_Addr/Projectile/FieldBoss/Anubis_Skill2.prefab index 337f75fe8..41c169a1e 100644 --- a/Assets/Res_Addr/Projectile/FieldBoss/Anubis_Skill2.prefab +++ b/Assets/Res_Addr/Projectile/FieldBoss/Anubis_Skill2.prefab @@ -48,9 +48,10 @@ MonoBehaviour: m_EditorClassIdentifier: ColliderLayer: Actor m_Pierce: 0 - str_HitEffect: Effect_Hit_AnubisSkil2 + str_HitEffect: Effect_Hit_AnubisSkill2 m_ShowTimeOverEffect: 1 m_Direction: 0 + m_Speed: 0 --- !u!65 &8240083998892309707 BoxCollider: m_ObjectHideFlags: 0 diff --git a/Assets/Script/Character/Actor.cs b/Assets/Script/Character/Actor.cs index 41bd0f6ca..5900ab8c6 100644 --- a/Assets/Script/Character/Actor.cs +++ b/Assets/Script/Character/Actor.cs @@ -182,6 +182,7 @@ public class Actor : MyCoroutine protected virtual void OnDestroy() { Off_Common(); + Off_CCEffect(); var enemies = ActorInfo.Ins.Get_EnemyActors(m_Enemy, Get_position(), 100f); for (int i = 0; i < enemies.Count; i++) enemies[i].ForceDel(this); diff --git a/Assets/Script/Character/Mob/Boss/Boss_Anubis.cs b/Assets/Script/Character/Mob/Boss/Boss_Anubis.cs index 9ba234c19..5a2ca149e 100644 --- a/Assets/Script/Character/Mob/Boss/Boss_Anubis.cs +++ b/Assets/Script/Character/Mob/Boss/Boss_Anubis.cs @@ -33,8 +33,8 @@ public class Boss_Anubis : 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,9 +103,11 @@ public class Boss_Anubis : BossMobActor break; } InGameInfo.Ins.Show_Effect("Effect_Anubis_Skill1End", Get_position()); + yield return new WaitForSeconds(0.2f); + + Model_OnOff(true); yield return new WaitForSeconds(0.2f); - Model_OnOff(true); m_NavMeshAgent.stoppingDistance = m_NavStopDistance; Check_Battle(); Init(true, false);