빙결 폭탄

This commit is contained in:
Ino 2025-05-13 07:20:47 +09:00
parent 1e7b2ea824
commit 3d1b93e641
8 changed files with 562 additions and 92730 deletions

View File

@ -87,8 +87,10 @@ messageinfo 엄청 느린 버그
몬스터 투사체 보완 몬스터 투사체 및 피격 이펙트 보완
펫 투사체 보완 보스몬스터 좀 더 보완
펫 투사체 및 피격 이펙트 보완
상태 이상 스킬 이펙트 보완
마검사 검기 이펙트 변경 마검사 검기 이펙트 변경

File diff suppressed because one or more lines are too long

Binary file not shown.

View File

@ -29,7 +29,8 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children:
- {fileID: 8932944118088588947}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &6673251188135490187 --- !u!114 &6673251188135490187
@ -46,6 +47,108 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
NoUseParticleTime: 1 NoUseParticleTime: 1
OffTime: 5 OffTime: 5
add_offset: {x: 0, y: 0, z: 0}
e_EffectLocation: 2 e_EffectLocation: 2
tf_Target: {fileID: 0} --- !u!1001 &5824857394981747573
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 3791624769364244468}
m_Modifications:
- target: {fileID: 2776794434381928530, guid: 472f376ba1bd0be47983c423afe8a3f6,
type: 3}
propertyPath: m_Name
value: FX_GodSkill_Icearrow_Hit
objectReference: {fileID: 0}
- target: {fileID: 3111492187714774502, guid: 472f376ba1bd0be47983c423afe8a3f6,
type: 3}
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3111492187714774502, guid: 472f376ba1bd0be47983c423afe8a3f6,
type: 3}
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3111492187714774502, guid: 472f376ba1bd0be47983c423afe8a3f6,
type: 3}
propertyPath: m_LocalScale.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3111492187714774502, guid: 472f376ba1bd0be47983c423afe8a3f6,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3111492187714774502, guid: 472f376ba1bd0be47983c423afe8a3f6,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3111492187714774502, guid: 472f376ba1bd0be47983c423afe8a3f6,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3111492187714774502, guid: 472f376ba1bd0be47983c423afe8a3f6,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3111492187714774502, guid: 472f376ba1bd0be47983c423afe8a3f6,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3111492187714774502, guid: 472f376ba1bd0be47983c423afe8a3f6,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3111492187714774502, guid: 472f376ba1bd0be47983c423afe8a3f6,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3111492187714774502, guid: 472f376ba1bd0be47983c423afe8a3f6,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3111492187714774502, guid: 472f376ba1bd0be47983c423afe8a3f6,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3111492187714774502, guid: 472f376ba1bd0be47983c423afe8a3f6,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7862973542015260876, guid: 472f376ba1bd0be47983c423afe8a3f6,
type: 3}
propertyPath: m_LocalScale.x
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 7862973542015260876, guid: 472f376ba1bd0be47983c423afe8a3f6,
type: 3}
propertyPath: m_LocalScale.y
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 7862973542015260876, guid: 472f376ba1bd0be47983c423afe8a3f6,
type: 3}
propertyPath: m_LocalScale.z
value: 0.25
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 472f376ba1bd0be47983c423afe8a3f6, type: 3}
--- !u!4 &8932944118088588947 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3111492187714774502, guid: 472f376ba1bd0be47983c423afe8a3f6,
type: 3}
m_PrefabInstance: {fileID: 5824857394981747573}
m_PrefabAsset: {fileID: 0}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1049,13 +1049,13 @@ public class Actor : MyCoroutine
if (!DSUtil.CheckNull(beaterActor)) if (!DSUtil.CheckNull(beaterActor))
{ {
if (!DSUtil.CheckNull(_dinfo.Beater_pd)) //if (!DSUtil.CheckNull(_dinfo.Beater_pd))
{ // 서리 상태인 적을 냉기 폭격으로 때렸을 때 얼림 //{ // 서리 상태인 적을 냉기 폭격으로 때렸을 때 얼림
var pd = _dinfo.Beater_pd; // var pd = _dinfo.Beater_pd;
if (!DSUtil.CheckNull(pd.m_SkillListTableData) && pd.m_SkillListTableData.e_Skill == eEffect.Skill_IceArrows && // if (!DSUtil.CheckNull(pd.m_SkillListTableData) && pd.m_SkillListTableData.e_Skill == eEffect.Skill_IceArrows &&
pd.CC_AddVal2 > 0f && IsSkillExtraStatus(eSkillExtraType.Frost)) // pd.CC_AddVal2 > 0f && IsSkillExtraStatus(eSkillExtraType.Frost))
Freeze(pd.CC_AddVal2, _dinfo.act_AfterFreezing); // Freeze(pd.CC_AddVal2, _dinfo.act_AfterFreezing);
} //}
var statinfo = beaterActor.Get_StatInfo(); var statinfo = beaterActor.Get_StatInfo();
if (!DSUtil.CheckNull(statinfo)) if (!DSUtil.CheckNull(statinfo))
@ -1163,6 +1163,7 @@ public class Actor : MyCoroutine
if (_dinfo.bExtraDmg) Cal_Damage(_dinfo); // 추가 데미지 if (_dinfo.bExtraDmg) Cal_Damage(_dinfo); // 추가 데미지
break; break;
case eSkillExtraType.Freezing: case eSkillExtraType.Freezing:
curCC = eCC.Freeze;
Freeze(LifeTime, _dinfo.act_AfterFreezing); Freeze(LifeTime, _dinfo.act_AfterFreezing);
if (_dinfo.bExtraDmg) Cal_Damage(_dinfo); // 추가 데미지 if (_dinfo.bExtraDmg) Cal_Damage(_dinfo); // 추가 데미지
break; break;
@ -1567,6 +1568,7 @@ public class Actor : MyCoroutine
{ {
Remove_Freeze(); Remove_Freeze();
dic_ccData[eCC.Freeze].CCTime = 0f; dic_ccData[eCC.Freeze].CCTime = 0f;
dic_CCEffect[eCC.Freeze].Off_Imm();
InGameInfo.Ins.Show_Effect("Effect_Hit_IceBolt", transform.position); InGameInfo.Ins.Show_Effect("Effect_Hit_IceBolt", transform.position);
act_AfterFreezing?.Invoke(this); act_AfterFreezing?.Invoke(this);
} }

View File

@ -3,26 +3,23 @@ using UnityEngine;
public class Skill_Frozen : ProjectileBase public class Skill_Frozen : ProjectileBase
{ {
public GameObject[] gos; // 0 날아가는 거, 1 터지는 거 public Vector3 originScale = Vector3.one * 0.5f;
[Header("날아가는 속도")] public Collider m_Coliider;
public float speed = 4f;
[Header("얼리는 범위")]
public Vector3 v3_freezescale = Vector3.one * 1.5f;
SkillListTableData awaken3_skilldata = new SkillListTableData(); SkillListTableData awaken3_skilldata = new SkillListTableData { e_SkillExtraType = eSkillExtraType.Frost, f_ExtraValue4 = 1f };
public override void Set(ProjectileData _data) public override void Set(ProjectileData _data)
{ {
_data.eStartPos = eProjectileStartPos.ShooterCenter; _data.eStartPos = eProjectileStartPos.Custom;
_data.v3_StartPos = _data.target.Get_position();
base.Set(_data); base.Set(_data);
gos[1].transform.localScale = v3_freezescale + (v3_freezescale * (IsStep(1) ? Get_AwakenData(1, 1) : 0f)); transform.eulerAngles = Vector3.zero;
transform.localScale = originScale + (originScale * (IsStep(1) ? Get_AwakenData(1, 1) : 0f));
_data.CC_AddTime = IsStep(2) ? Get_AwakenData(2, 1) : 0; _data.CC_AddTime = IsStep(2) ? Get_AwakenData(2, 1) : 0;
awaken3_skilldata.e_SkillExtraType = eSkillExtraType.Frost;
awaken3_skilldata.f_ExtraValue1 = Get_AwakenData(3, 1); awaken3_skilldata.f_ExtraValue1 = Get_AwakenData(3, 1);
awaken3_skilldata.f_ExtraValue2 = Get_AwakenData(3, 2); awaken3_skilldata.f_ExtraValue2 = Get_AwakenData(3, 2);
awaken3_skilldata.f_ExtraValue3 = Get_AwakenData(3, 3); awaken3_skilldata.f_ExtraValue3 = Get_AwakenData(3, 3);
awaken3_skilldata.f_ExtraValue4 = 1f;
act_afterFreezing = IsStep(3) ? hitter => act_afterFreezing = IsStep(3) ? hitter =>
{ {
var copydinfo = Get_DamageInfo(); var copydinfo = Get_DamageInfo();
@ -35,20 +32,10 @@ public class Skill_Frozen : ProjectileBase
IEnumerator Co_Update() IEnumerator Co_Update()
{ {
DSUtil.InActivateGameObjects(gos, 0); m_Coliider.enabled = true;
while (true) yield return null;
{ m_Coliider.enabled = false;
var targetPos = m_ProjecTileData.target.Get_Center_position(); yield return new WaitForSeconds(5f);
transform.position = Vector3.MoveTowards(transform.position, targetPos, Time.deltaTime * speed);
if (Vector3.Distance(transform.position, targetPos) < 0.2f)
break;
yield return null;
}
DSUtil.InActivateGameObjects(gos, 1);
gos[1].transform.position = m_ProjecTileData.target.Get_position();
yield return new WaitForSeconds(1f);
Off(true); Off(true);
} }
} }