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

상태이상 이펙트 1

This commit is contained in:
Ino 2025-05-14 08:11:24 +09:00
parent 0590236183
commit 7568eb41c2
18 changed files with 19776 additions and 143355 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/ResWork/Table/Export/SkillTypeConfig.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.

19350
Assets/Res_Addr/Effect/Effect_Blood.prefab
View File

File diff suppressed because it is too large Load Diff

4804
Assets/Res_Addr/Effect/Effect_DefenceDecrease.prefab
View File

File diff suppressed because it is too large Load Diff

59
Assets/Res_Addr/Effect/Effect_Freezing.prefab
View File

@ -30,7 +30,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8932944118088588947}
- {fileID: 4109013305180678486}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &6673251188135490187
@ -46,9 +46,9 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
NoUseParticleTime: 1
OffTime: 5
OffTime: 1
e_EffectLocation: 2
--- !u!1001 &5824857394981747573
--- !u!1001 &3967912919237239849
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
@ -56,99 +56,84 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 3791624769364244468}
m_Modifications:
- target: {fileID: 2776794434381928530, guid: 472f376ba1bd0be47983c423afe8a3f6,
- target: {fileID: 1015278120664845694, guid: dc785478ce3668142814c25b983b74c0,
type: 3}
propertyPath: m_Name
value: FX_GodSkill_Icearrow_Hit
value: Shield_freezing
objectReference: {fileID: 0}
- target: {fileID: 3111492187714774502, guid: 472f376ba1bd0be47983c423afe8a3f6,
- target: {fileID: 1015278120664845695, guid: dc785478ce3668142814c25b983b74c0,
type: 3}
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3111492187714774502, guid: 472f376ba1bd0be47983c423afe8a3f6,
- target: {fileID: 1015278120664845695, guid: dc785478ce3668142814c25b983b74c0,
type: 3}
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3111492187714774502, guid: 472f376ba1bd0be47983c423afe8a3f6,
- target: {fileID: 1015278120664845695, guid: dc785478ce3668142814c25b983b74c0,
type: 3}
propertyPath: m_LocalScale.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3111492187714774502, guid: 472f376ba1bd0be47983c423afe8a3f6,
- target: {fileID: 1015278120664845695, guid: dc785478ce3668142814c25b983b74c0,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3111492187714774502, guid: 472f376ba1bd0be47983c423afe8a3f6,
- target: {fileID: 1015278120664845695, guid: dc785478ce3668142814c25b983b74c0,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3111492187714774502, guid: 472f376ba1bd0be47983c423afe8a3f6,
- target: {fileID: 1015278120664845695, guid: dc785478ce3668142814c25b983b74c0,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3111492187714774502, guid: 472f376ba1bd0be47983c423afe8a3f6,
- target: {fileID: 1015278120664845695, guid: dc785478ce3668142814c25b983b74c0,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3111492187714774502, guid: 472f376ba1bd0be47983c423afe8a3f6,
- target: {fileID: 1015278120664845695, guid: dc785478ce3668142814c25b983b74c0,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3111492187714774502, guid: 472f376ba1bd0be47983c423afe8a3f6,
- target: {fileID: 1015278120664845695, guid: dc785478ce3668142814c25b983b74c0,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3111492187714774502, guid: 472f376ba1bd0be47983c423afe8a3f6,
- target: {fileID: 1015278120664845695, guid: dc785478ce3668142814c25b983b74c0,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3111492187714774502, guid: 472f376ba1bd0be47983c423afe8a3f6,
- target: {fileID: 1015278120664845695, guid: dc785478ce3668142814c25b983b74c0,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3111492187714774502, guid: 472f376ba1bd0be47983c423afe8a3f6,
- target: {fileID: 1015278120664845695, guid: dc785478ce3668142814c25b983b74c0,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3111492187714774502, guid: 472f376ba1bd0be47983c423afe8a3f6,
- target: {fileID: 1015278120664845695, guid: dc785478ce3668142814c25b983b74c0,
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
m_SourcePrefab: {fileID: 100100000, guid: dc785478ce3668142814c25b983b74c0, type: 3}
--- !u!4 &4109013305180678486 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3111492187714774502, guid: 472f376ba1bd0be47983c423afe8a3f6,
m_CorrespondingSourceObject: {fileID: 1015278120664845695, guid: dc785478ce3668142814c25b983b74c0,
type: 3}
m_PrefabInstance: {fileID: 5824857394981747573}
m_PrefabInstance: {fileID: 3967912919237239849}
m_PrefabAsset: {fileID: 0}

154
Assets/Res_Addr/Effect/Effect_Hit_Skill_Frozen.prefab Normal file
View File

@ -0,0 +1,154 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &3688278240300928816
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3791624769364244468}
- component: {fileID: 6673251188135490187}
m_Layer: 0
m_Name: Effect_Hit_Skill_Frozen
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3791624769364244468
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3688278240300928816}
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: 8932944118088588947}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &6673251188135490187
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3688278240300928816}
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 &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}

7
Assets/Res_Addr/Effect/Effect_Hit_Skill_Frozen.prefab.meta Normal file
View File

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

29184
Assets/Res_Addr/Effect/Effect_Slow.prefab
View File

File diff suppressed because it is too large Load Diff

29580
Assets/Res_Addr/Effect/Effect_SpeedUp.prefab
View File

File diff suppressed because it is too large Load Diff

79937
Assets/Res_Addr/Effect/Effect_StatUp.prefab
View File

File diff suppressed because it is too large Load Diff

2
Assets/Res_Addr/Skill/Skill_Frozen.prefab
View File

@ -48,7 +48,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
ColliderLayer: Actor
m_Pierce: 1
str_HitEffect: Effect_Freezing
str_HitEffect: Effect_Hit_Skill_Frozen
m_ShowTimeOverEffect: 1
originScale: {x: 0.5, y: 0.5, z: 0.5}
m_Coliider: {fileID: 7995500502851335835}

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

@ -720,12 +720,14 @@ public class Actor : MyCoroutine
}
}
if (!Check_MagicCoolTime(index) && !testskill) return false;
if (!testskill && !Check_MagicCoolTime(index))
return false;
list_SkillData[index].m_SkillListTableData = m_Magic.m_SkillTableData;
list_SkillData[index].target = m_Target;
m_SkillData = list_SkillData[index];
if (!testskill) m_Stat.Set_Stat(false, eStat.MP, skilldata.n_MP);
else m_SkillData.SetSkillExtraType = true;
Set_MagicCoolTime(skilldata.Get_CoolTime(m_Stat.Get_Stat(eStat.COOLTIME_Multiplier)), index);
if (IsMainPC() && !testskill) ServerInfo.Ins.m_ServerData.Add_MissionCount(ePurpose.USE_SKILL_ALL);
return Play_Skill(skilldata.s_Animation);
@ -740,11 +742,6 @@ public class Actor : MyCoroutine
//NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.ShootMagic);
Del_Magic();
}
public void Set_Magic(SkillListTableData skill, Actor target)
{
m_Magic = new UseMagicInfo { m_SkillTableData = skill };
m_SkillData = new ProjectileData { shooter = this, target = target, m_SkillListTableData = skill };
}
public void Del_Magic()
{
if (!DSUtil.CheckNull(co_casting))
@ -1223,6 +1220,7 @@ public class Actor : MyCoroutine
Set_Target(_dinfo.Beater);
break;
case eSkillExtraType.VampirHeal:
LifeTime = 2f; // 이펙트 시간
_dinfo.Beater.Heal(val2);
_dinfo.Beater.Heal_MP(val3);
break;

11
Assets/Script/Character/Projectile/Skill/Skill_Heal.cs
View File

@ -9,11 +9,14 @@ public class Skill_Heal : ProjectileBase
_data.eStartPos = eProjectileStartPos.Custom;
var pos = _data.target.Get_position();
_data.v3_StartPos = new Vector3(pos.x, 0f, pos.z);
_data.Copy(m_ProjecTileData);
m_ProjecTileData.e_SkillExtraType = IsStep(3) ? eSkillExtraType.Cure : eSkillExtraType.None;
base.Set(_data);
transform.eulerAngles = Vector3.zero;
_data.m_skillTypeConfigTable = table_skilltypeconfig.Ins.Get_Data_orNull(eSkillExtraType.Cure);
_data.Copy(m_ProjecTileData);
_data.e_SkillExtraType = IsStep(3) ? eSkillExtraType.Cure : eSkillExtraType.None;
base.Set(_data);
transform.eulerAngles = Vector3.zero;
if (IsStep(1)) Set_ReduceCoolTime_byStep(1);
var healinfo = Get_DamageInfo(false, false);
healinfo.Damage += healinfo.Damage * (IsStep(2) ? Get_AwakenData(2, 1) : 0);

2
Assets/Script/Character/Projectile/Skill/Skill_IceArrows.cs
View File

@ -13,7 +13,7 @@ public class Skill_IceArrows : ProjectileBase
_data.v3_StartPos = _data.target.Get_position();
_data.eStartPos = eProjectileStartPos.Custom;
_data.LookTarget = false;
_data.SetSkillExtraType = false;
//_data.SetSkillExtraType = false;
base.Set(_data);

2
Assets/Script/Info/InGameInfo.cs
View File

@ -259,7 +259,7 @@ public partial class InGameInfo : MyCoroutine
var effect = temp.GetComponent<TurnOff_GO>();
effect.Set(target, pd, lifeTime);
effect.Set_EffectwhenOff(stcData.s_SkillEffectWhenOff);
temp.transform.localScale = Vector3.one * stcData.n_EffectScale;
temp.transform.localScale = stcData.v3_Scale;
var chekers = temp.GetComponentsInChildren<ProjectileHitChecker>(true);
for (int i = 0; i < chekers.Length; i++)

8
Assets/Script/Table/Skill/table_skilltypeconfig.cs
View File

@ -1,6 +1,7 @@
using System.Collections.Generic;
using CodeStage.AntiCheat.ObscuredTypes;
using Newtonsoft.Json;
using UnityEngine;
public enum eEffectLocation { Top, Mid, Bottom }
/// <summary>
@ -39,8 +40,8 @@ public class SkillTypeConfigTableData : TableDataBase
}
// 이펙트 크기 보정
ObscuredInt _EffectScale;
public int n_EffectScale
ObscuredFloat _EffectScale;
public float f_EffectScale
{
get { return _EffectScale; }
set { _EffectScale = value; _EffectScale.RandomizeCryptoKey(); }
@ -58,7 +59,7 @@ public class SkillTypeConfigTableData : TableDataBase
set { _EffectInfoDesc = value; _EffectInfoDesc.RandomizeCryptoKey(); }
}
public Vector3 v3_Scale;
public string Get_Desc() { return table_localtext.Ins.Get_Text(n_EffectInfoDesc); }
}
@ -80,6 +81,7 @@ public class table_skilltypeconfig : table_missionbase
for (int i = 0; i < Get_DataList().Count; i++)
{
var temp = Get_DataList()[i];
temp.v3_Scale = Vector3.one * temp.f_EffectScale;
dic_Data.Add(temp.e_SkillExtraType, temp);
}

8
Assets/Script/Util/ErrorLogHookManager.cs
View File

@ -64,5 +64,13 @@ public partial class SROptions
ServerInfo.Ins.m_ServerData.Add_SkillLv(lst[i].n_SkillID);
}
}
public void Awaken_AllSkill()
{
var lst = table_skilllist.Ins.Get_DataList(eSkillType.Active);
for (int i = 0; i < lst.Count; i++)
{
ServerInfo.Ins.m_ServerData.Add_SkillAwakenLv(lst[i].n_SkillID);
}
}
#endif
}

11
Assets/Script/zSettings/StatTest/MainToStatTest.cs
View File

@ -101,17 +101,6 @@ public class MainToStatTest : MonoBehaviourSingletonTemplate<MainToStatTest>
var classdata = table_classconfig.Ins.Get_Data_orNull(m_ClassID);
labels[3].text = $"{classdata.Get_JobName()}, {classdata.e_BattleType}, {actors[0].m_AttackType}";
}
public void Set_Skill()
{
var split = m_TMP_Dropdown_Skill.captionText.text.Split(',');
m_SkillIndex = int.Parse(split[1]);
OnClick_ReSkill();
}
public void OnClick_ReSkill()
{
actors[0].Set_Magic(list_skilldata[m_SkillIndex], actors[1]);
actors[0].Play_Skill(list_skilldata[m_SkillIndex].s_Animation);
}
public void Set_Dmglabel(string s)
{