NerdNavis_AiDev
/
Project_WL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

퀸 언데드 스킬2

This commit is contained in:
Ino 2025-06-08 08:44:27 +09:00
parent 4700b9f7a8
commit 14c440071e
10 changed files with 282 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/ResWork/Table/Export/MonsterList.json
View File

File diff suppressed because one or more lines are too long

BIN
Assets/ResWork/Table/butler.xlsm
View File

Binary file not shown.

2
Assets/Res_Addr/Mobs/FieldBoss/Queen_Undead.prefab
View File

@ -5045,6 +5045,8 @@ MonoBehaviour:
Skill2CoolTime: 18
Skill2ChargingTime: 2
Skill2Dmg: 3.2
Skill2BackDist: 7.5
Skill2BackDuration: 2
--- !u!95 &1024452805773796894
Animator:
serializedVersion: 5

125
Assets/Res_Addr/Obj/UndeadQueen_Skill2_Indicator.prefab Normal file
View File

@ -0,0 +1,125 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &821061129531636761
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2201136656505196193}
m_Layer: 3
m_Name: UndeadQueen_Skill2_Indicator
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2201136656505196193
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 821061129531636761}
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: 1928388234376554137}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1931060179145746787
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 2201136656505196193}
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: 1.45
objectReference: {fileID: 0}
- target: {fileID: 4367129774968826, guid: a93b07a8595bb0145bc3af1e9911c409, type: 3}
propertyPath: m_LocalScale.z
value: 1.45
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: 2
objectReference: {fileID: 0}
- target: {fileID: 198706515776294966, guid: a93b07a8595bb0145bc3af1e9911c409,
type: 3}
propertyPath: InitialModule.startLifetime.scalar
value: 2
objectReference: {fileID: 0}
- target: {fileID: 198980401682514854, guid: a93b07a8595bb0145bc3af1e9911c409,
type: 3}
propertyPath: lengthInSec
value: 1.5
objectReference: {fileID: 0}
- target: {fileID: 198980401682514854, guid: a93b07a8595bb0145bc3af1e9911c409,
type: 3}
propertyPath: InitialModule.startLifetime.scalar
value: 1.5
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a93b07a8595bb0145bc3af1e9911c409, type: 3}
--- !u!4 &1928388234376554137 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4367129774968826, guid: a93b07a8595bb0145bc3af1e9911c409,
type: 3}
m_PrefabInstance: {fileID: 1931060179145746787}
m_PrefabAsset: {fileID: 0}

7
Assets/Res_Addr/Obj/UndeadQueen_Skill2_Indicator.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 3edb6789f148f334abe274a12c9a5955
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

149
Assets/Res_Addr/Projectile/FieldBoss/QueenUndead_Skill2.prefab
View File

@ -10,7 +10,7 @@ GameObject:
m_Component:
- component: {fileID: 8021888228437686570}
- component: {fileID: -5713809970239949725}
- component: {fileID: 8240083998892309707}
- component: {fileID: 6334456434677187323}
m_Layer: 0
m_Name: QueenUndead_Skill2
m_TagString: Untagged
@ -31,7 +31,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1502273801561567804}
- {fileID: 6694562011596558680}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &-5713809970239949725
@ -49,10 +49,10 @@ MonoBehaviour:
ColliderLayer: Actor
m_Pierce: 1
str_HitEffect:
m_ShowTimeOverEffect: 1
m_ShowTimeOverEffect: 0
FollowTarget: 0
--- !u!65 &8240083998892309707
BoxCollider:
--- !u!135 &6334456434677187323
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -70,9 +70,9 @@ BoxCollider:
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 5, y: 2, z: 5}
m_Radius: 3.5
m_Center: {x: 0, y: 0, z: 0}
--- !u!1001 &7586815488278605199
--- !u!1001 &6712880047951534948
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
@ -80,69 +80,164 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 8021888228437686570}
m_Modifications:
- target: {fileID: 9047993804416933808, guid: a1c0491ab6b58b945bfe4d92c2c31ad5,
- target: {fileID: 130371808140617203, guid: 98783eafbabdb99478e8001a6ea75f2c,
type: 3}
propertyPath: m_Name
value: HCFX_Appear_01_End
propertyPath: randomSeed
value: 2661
objectReference: {fileID: 0}
- target: {fileID: 9047993804416933811, guid: a1c0491ab6b58b945bfe4d92c2c31ad5,
- target: {fileID: 130371808140617203, guid: 98783eafbabdb99478e8001a6ea75f2c,
type: 3}
propertyPath: autoRandomSeed
value: 0
objectReference: {fileID: 0}
- target: {fileID: 130371808180272905, guid: 98783eafbabdb99478e8001a6ea75f2c,
type: 3}
propertyPath: randomSeed
value: 2663
objectReference: {fileID: 0}
- target: {fileID: 130371808180272905, guid: 98783eafbabdb99478e8001a6ea75f2c,
type: 3}
propertyPath: autoRandomSeed
value: 0
objectReference: {fileID: 0}
- target: {fileID: 130371809036173258, guid: 98783eafbabdb99478e8001a6ea75f2c,
type: 3}
propertyPath: randomSeed
value: 2660
objectReference: {fileID: 0}
- target: {fileID: 130371809036173258, guid: 98783eafbabdb99478e8001a6ea75f2c,
type: 3}
propertyPath: autoRandomSeed
value: 0
objectReference: {fileID: 0}
- target: {fileID: 130371810037123618, guid: 98783eafbabdb99478e8001a6ea75f2c,
type: 3}
propertyPath: randomSeed
value: 2658
objectReference: {fileID: 0}
- target: {fileID: 130371810037123618, guid: 98783eafbabdb99478e8001a6ea75f2c,
type: 3}
propertyPath: autoRandomSeed
value: 0
objectReference: {fileID: 0}
- target: {fileID: 130371810037123644, guid: 98783eafbabdb99478e8001a6ea75f2c,
type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 130371810037123644, guid: 98783eafbabdb99478e8001a6ea75f2c,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9047993804416933811, guid: a1c0491ab6b58b945bfe4d92c2c31ad5,
- target: {fileID: 130371810037123644, guid: 98783eafbabdb99478e8001a6ea75f2c,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9047993804416933811, guid: a1c0491ab6b58b945bfe4d92c2c31ad5,
- target: {fileID: 130371810037123644, guid: 98783eafbabdb99478e8001a6ea75f2c,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9047993804416933811, guid: a1c0491ab6b58b945bfe4d92c2c31ad5,
- target: {fileID: 130371810037123644, guid: 98783eafbabdb99478e8001a6ea75f2c,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 9047993804416933811, guid: a1c0491ab6b58b945bfe4d92c2c31ad5,
- target: {fileID: 130371810037123644, guid: 98783eafbabdb99478e8001a6ea75f2c,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 9047993804416933811, guid: a1c0491ab6b58b945bfe4d92c2c31ad5,
- target: {fileID: 130371810037123644, guid: 98783eafbabdb99478e8001a6ea75f2c,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 9047993804416933811, guid: a1c0491ab6b58b945bfe4d92c2c31ad5,
- target: {fileID: 130371810037123644, guid: 98783eafbabdb99478e8001a6ea75f2c,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 9047993804416933811, guid: a1c0491ab6b58b945bfe4d92c2c31ad5,
- target: {fileID: 130371810037123644, guid: 98783eafbabdb99478e8001a6ea75f2c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9047993804416933811, guid: a1c0491ab6b58b945bfe4d92c2c31ad5,
- target: {fileID: 130371810037123644, guid: 98783eafbabdb99478e8001a6ea75f2c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9047993804416933811, guid: a1c0491ab6b58b945bfe4d92c2c31ad5,
- target: {fileID: 130371810037123644, guid: 98783eafbabdb99478e8001a6ea75f2c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 130371810037123645, guid: 98783eafbabdb99478e8001a6ea75f2c,
type: 3}
propertyPath: m_Name
value: HCFX_MagicCircle_03
objectReference: {fileID: 0}
- target: {fileID: 130371810121128449, guid: 98783eafbabdb99478e8001a6ea75f2c,
type: 3}
propertyPath: randomSeed
value: 2662
objectReference: {fileID: 0}
- target: {fileID: 130371810121128449, guid: 98783eafbabdb99478e8001a6ea75f2c,
type: 3}
propertyPath: autoRandomSeed
value: 0
objectReference: {fileID: 0}
- target: {fileID: 175027672699946124, guid: 98783eafbabdb99478e8001a6ea75f2c,
type: 3}
propertyPath: randomSeed
value: 2659
objectReference: {fileID: 0}
- target: {fileID: 175027672699946124, guid: 98783eafbabdb99478e8001a6ea75f2c,
type: 3}
propertyPath: autoRandomSeed
value: 0
objectReference: {fileID: 0}
- target: {fileID: 175027673274080905, guid: 98783eafbabdb99478e8001a6ea75f2c,
type: 3}
propertyPath: randomSeed
value: 2664
objectReference: {fileID: 0}
- target: {fileID: 175027673274080905, guid: 98783eafbabdb99478e8001a6ea75f2c,
type: 3}
propertyPath: autoRandomSeed
value: 0
objectReference: {fileID: 0}
- target: {fileID: 175027673768594229, guid: 98783eafbabdb99478e8001a6ea75f2c,
type: 3}
propertyPath: randomSeed
value: 2665
objectReference: {fileID: 0}
- target: {fileID: 175027673768594229, guid: 98783eafbabdb99478e8001a6ea75f2c,
type: 3}
propertyPath: autoRandomSeed
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4705847414268040813, guid: 98783eafbabdb99478e8001a6ea75f2c,
type: 3}
propertyPath: randomSeed
value: 2666
objectReference: {fileID: 0}
- target: {fileID: 4705847414268040813, guid: 98783eafbabdb99478e8001a6ea75f2c,
type: 3}
propertyPath: autoRandomSeed
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a1c0491ab6b58b945bfe4d92c2c31ad5, type: 3}
--- !u!4 &1502273801561567804 stripped
m_SourcePrefab: {fileID: 100100000, guid: 98783eafbabdb99478e8001a6ea75f2c, type: 3}
--- !u!4 &6694562011596558680 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 9047993804416933811, guid: a1c0491ab6b58b945bfe4d92c2c31ad5,
m_CorrespondingSourceObject: {fileID: 130371810037123644, guid: 98783eafbabdb99478e8001a6ea75f2c,
type: 3}
m_PrefabInstance: {fileID: 7586815488278605199}
m_PrefabInstance: {fileID: 6712880047951534948}
m_PrefabAsset: {fileID: 0}

9
Assets/Script/Character/Actor.cs
View File

@ -1291,7 +1291,7 @@ public class Actor : MyCoroutine
// 앞 a == 0,0,0 b == 0,0,1
// 뒤 a == 0,0,0 b == 0,0,-1
Knockback_byHitter((b - a).normalized, val1, 10.0f, () => { Stun(val2, true); });
TimeMgr.Ins.Set_TimeScale(0.025f, 0.05f);
TimeMgr.Ins.Set_TimeScale();
}
break;
}
@ -1848,12 +1848,12 @@ public class Actor : MyCoroutine
}
#endregion
#region 위치로 점프 이동
public void JumpToPosition(Vector3 targetPos, float duration, float height = 1f, Action after = null)
public void JumpToPosition(Vector3 targetPos, float duration, float height = 1f, bool onNavMesh = false, Action after = null)
{
StartCoroutine(Co_JumpToPosition(targetPos, duration, height, after));
StartCoroutine(Co_JumpToPosition(targetPos, duration, height, onNavMesh, after));
}
IEnumerator Co_JumpToPosition(Vector3 targetPos, float duration, float height, Action after)
IEnumerator Co_JumpToPosition(Vector3 targetPos, float duration, float height, bool onNavMesh = false, Action after = null)
{
StopMove_Imm(false);
m_NavMeshAgent.enabled = false;
@ -1879,6 +1879,7 @@ public class Actor : MyCoroutine
transform.position = targetPos;
m_NavMeshAgent.enabled = true;
if (onNavMesh) On_NavMeshAgent();
after?.Invoke();
}
#endregion

2
Assets/Script/Character/Mob/Boss/Boss_Anubis.cs
View File

@ -137,7 +137,7 @@ public class Boss_Anubis : BossMobActor
IEnumerator Co_ShootSkill2(Vector3 pos, int count)
{
int shootcount = -1;
JumpToPosition(pos, 0.25f, 0.35f, () => { shootcount = count; });
JumpToPosition(pos, 0.25f, 0.35f, false, () => { shootcount = count; });
while (shootcount != 0)
{
yield return null;

21
Assets/Script/Character/Mob/Boss/Boss_QueenUndead.cs
View File

@ -21,6 +21,10 @@ public class Boss_QueenUndead : BossMobActor
public float Skill2ChargingTime = 2f;
[Header("스킬2 데미지")]
public float Skill2Dmg = 3.2f;
[Header("스킬2 뒤로 점프하는 거리")]
public float Skill2BackDist = 7.5f;
[Header("스킬2 뒤로 점프하는 시간")]
public float Skill2BackDuration = 1.5f;
SkillListTableData m_SilenceCurse = new SkillListTableData { e_SkillExtraType = eSkillExtraType.SilenceCurse, f_ExtraValue4 = 1f };
@ -30,6 +34,8 @@ public class Boss_QueenUndead : BossMobActor
go_attackeffect.SetActive(false);
Load_Indicator("UndeadQueen_Skill2_Indicator", 0);
m_SilenceCurse.f_ExtraValue1 = Skill1LifeTime;
m_SilenceCurse.f_ExtraValue2 = Skill1Manaburn;
@ -37,7 +43,7 @@ public class Boss_QueenUndead : BossMobActor
CoolTime_Skill2 = 2f;
CoolTime_Skill1 = 10000f;
CoolTime_Skill2 = 20000f;
//CoolTime_Skill2 = 20000f;
}
protected override void Init(bool initSkill1CoolTime, bool initSkill2CoolTime)
@ -93,12 +99,15 @@ public class Boss_QueenUndead : BossMobActor
AnimationPlay("boss_skill2charging");
InGameInfo.Ins.Show_Effect("Effect_QueenUndeadCharging", this, eEffectLocation.Bottom, Skill2ChargingTime);
InGameInfo.Ins.Show_Effect("Effect_QueenUndeadSkill2Start", Get_position());
dic_indicator[0].transform.position = Get_position();
dic_indicator[0].SetActive(true);
yield return new WaitForSeconds(Skill2ChargingTime);
AnimationPlay("boss_skill2attack");
dic_indicator[0].SetActive(false);
yield return new WaitForSeconds(0.5f);
InGameInfo.Ins.Show_Effect("Effect_QueenUndeadSkill2End", Get_position());
//yield return new WaitForSeconds(0.5f);
//InGameInfo.Ins.Show_Effect("Effect_QueenUndeadSkill2End", Get_position());
yield return new WaitForSeconds(1.0f);
Check_Battle();
@ -112,5 +121,11 @@ public class Boss_QueenUndead : BossMobActor
pd.e_SkillExtraType = m_SilenceCurse.e_SkillExtraType;
pd.m_skillTypeConfigTable = table_skilltypeconfig.Ins.Get_Data_orNull(pd.e_SkillExtraType);
pd.m_SkillListTableData = m_SilenceCurse;
pd.Action_OnHit = hitter =>
{
if (hitter.IsMainPC()) TimeMgr.Ins.Set_TimeScale();
var pos = (hitter.Get_position() - Get_position()) * Skill2BackDist + hitter.Get_position();
hitter.JumpToPosition(pos, Skill2BackDuration, 1f, true);
};
}
}

2
Assets/Script/Mgr/TimeMgr.cs
View File

@ -8,7 +8,7 @@ public class TimeMgr : MonoBehaviourSingletonTemplate<TimeMgr>
DontDestroy();
}
public void Set_TimeScale(float delaytime, float _timescale)
public void Set_TimeScale(float delaytime = 0.025f, float _timescale = 0.05f)
{
StopCoroutine(nameof(Run_TimeScale));
StartCoroutine(Run_TimeScale(delaytime, _timescale));