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

skull shaman b,c

This commit is contained in:
Ino 2025-02-10 14:35:41 +09:00
parent ab5750655c
commit ef0704dc24
13 changed files with 395 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

155
Assets/Res_Addr/Projectile/Elite/P_Skull_Shaman_B.prefab Normal file
View File

@ -0,0 +1,155 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &359492963229537179
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3212436743952790601}
- component: {fileID: 2864512912963179641}
- component: {fileID: 5611405915983910845}
m_Layer: 0
m_Name: Cube
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &3212436743952790601
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 359492963229537179}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 3, y: 3, z: 3}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 223961062764596305}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &2864512912963179641
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 359492963229537179}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &5611405915983910845
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 359492963229537179}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10306, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &907428178798376589
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 223961062764596305}
- component: {fileID: 6311613290837446200}
- component: {fileID: 6782093134866277011}
m_Layer: 0
m_Name: P_Skull_Shaman_B
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &223961062764596305
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 907428178798376589}
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: 3212436743952790601}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &6311613290837446200
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 907428178798376589}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e5d2fd9d460da6a4d87b4be83a4cdc32, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Pierce: 0
str_HitEffect: PoisonHit
m_ShowTimeOverEffect: 0
--- !u!65 &6782093134866277011
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 907428178798376589}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 3, y: 3, z: 3}
m_Center: {x: 0, y: 0, z: 0}

7
Assets/Res_Addr/Projectile/Elite/P_Skull_Shaman_B.prefab.meta Normal file
View File

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

155
Assets/Res_Addr/Projectile/Elite/P_Skull_Shaman_C.prefab Normal file
View File

@ -0,0 +1,155 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &359492963229537179
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3212436743952790601}
- component: {fileID: 2864512912963179641}
- component: {fileID: 5611405915983910845}
m_Layer: 0
m_Name: Cube
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &3212436743952790601
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 359492963229537179}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 3, y: 3, z: 3}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 223961062764596305}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &2864512912963179641
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 359492963229537179}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &5611405915983910845
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 359492963229537179}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10306, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &907428178798376589
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 223961062764596305}
- component: {fileID: 6311613290837446200}
- component: {fileID: 6782093134866277011}
m_Layer: 0
m_Name: P_Skull_Shaman_C
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &223961062764596305
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 907428178798376589}
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: 3212436743952790601}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &6311613290837446200
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 907428178798376589}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e5d2fd9d460da6a4d87b4be83a4cdc32, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Pierce: 0
str_HitEffect: PoisonHit
m_ShowTimeOverEffect: 0
--- !u!65 &6782093134866277011
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 907428178798376589}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 3, y: 3, z: 3}
m_Center: {x: 0, y: 0, z: 0}

7
Assets/Res_Addr/Projectile/Elite/P_Skull_Shaman_C.prefab.meta Normal file
View File

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

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

@ -664,10 +664,11 @@ public class Actor : MyCoroutine
public virtual void Heal(double _hp, bool showhud = true)
{
if (IsDead()) return;
_hp = Math.Max(1, _hp);
m_Stat.Set_Stat(true, eStat.HP, _hp);
#if UNITY_EDITOR
if (UnityEngine.SceneManagement.SceneManager.GetActiveScene().name == "StatTest")
if (SceneManager.GetActiveScene().name == "StatTest")
{
MainToStatTest.Ins.Set_Dmglabel($"HP : {_hp}");
return;
@ -1551,13 +1552,6 @@ public class Actor : MyCoroutine
public virtual void Play_Hit()
{
HitEffect_Color();
if (IsDead() || IsCC() || CurAnim >= eAnim.Attack) return; // 공격, 스킬 쓸 때는 피격 애님 무시
if (CurAnim == eAnim.Run) return; // 달릴 때도 무시
if (IsRole(eRole.Mob)) m_HitTime = 0.5f;
var aniname = MyValue.Get_AnimName(eAnim.Hit);
m_animation.speed = 1f;
AnimationPlay(aniname);
}
public virtual void Play_Die()
{

49
Assets/Script/Character/Mob/MobActor.cs
View File

@ -400,6 +400,20 @@ public class MobActor : Actor
base.Shoot_Skill();
Reset_AttackCoolTime();
}
public override DamageInfo Get_DamageInfo(ProjectileData _pd, double _attackrate = 1, bool forceCri = false)
{
var dinfo = base.Get_DamageInfo(_pd, _attackrate, forceCri);
if (m_Stat.Get_Stat(eStat.DMG_TO_HP) > 0d)
dinfo.act_returnLastDmg = Get_LastDmg;
return dinfo;
}
private void Get_LastDmg(double dmg)
{
if (m_Stat.Get_Stat(eStat.DMG_TO_HP) > 0d)
Heal(dmg * m_Stat.Get_Stat(eStat.DMG_TO_HP));
}
public override void Get_Damage(DamageInfo _dinfo)
{
//_dinfo.Damage = 1f; // 테스트 : 몹 안 죽게
@ -452,6 +466,41 @@ public class MobActor : Actor
m_MobMark.Set(active, tf_HUD_Dmg);
}
public override void Play_Hit()
{
base.Play_Hit();
switch (m_SubRole)
{
default:
switch (CurAnim)
{
case eAnim.Die:
case eAnim.Hit:
case eAnim.Attack:
case eAnim.Skill:
return;
}
break;
case eSubRol.Elite:
switch (CurAnim)
{
case eAnim.Run:
case eAnim.Die:
case eAnim.Hit:
case eAnim.Attack:
case eAnim.Skill:
return;
}
break;
case eSubRol.Boss:
return;
}
if (IsDead() || IsCC()) return;
if (IsRole(eRole.Mob)) m_HitTime = 0.5f;
m_animation.speed = 1f;
AnimationPlay(MyValue.Get_AnimName(eAnim.Hit));
}
public override void Projectile(string s)
{
base.Projectile(s);

11
Assets/Script/Character/MyActor.cs
View File

@ -164,6 +164,17 @@ public class MyActor : Actor
}
}
}
public override void Play_Hit()
{
base.Play_Hit();
if (CurAnim == eAnim.Run) return; // 달릴 때도 무시
if (IsDead() || IsCC() || CurAnim >= eAnim.Attack) return; // 공격, 스킬 쓸 때는 피격 애님 무시
if (IsRole(eRole.Mob)) m_HitTime = 0.5f;
var aniname = MyValue.Get_AnimName(eAnim.Hit);
m_animation.speed = 1f;
AnimationPlay(aniname);
}
public override void On_Regen()
{

4
Assets/Script/Util/MyEnum.cs
View File

@ -178,6 +178,8 @@ public enum eStat
Reduction_in_Immediate_Harvest_Cost,
Reclaim_Used_Resources,
DMG_TO_HP,
None
}
@ -228,6 +230,8 @@ public enum eSkillEnhance
STR_Up, DEX_Up, INT_Up, LUCK_Up, ATK_SPD_Up, MOV_SPD_Up, PIERCING, Boss_Dmg, Monster_Dmg, GoldHunter, MP_Down, AttackRange_Up,
Dmg_Decrease, Dmg_Up, CRI_Up, SkillCoolTime, PetStat_Up,
DMG_TO_HP,
Newbie,
}

2
Assets/Script/Util/MyValue.cs
View File

@ -776,6 +776,8 @@ public class ActorStatInfo
switch (skilldata.e_SkillEnhance)
{
case eSkillEnhance.ATK_SPD_Up: Set_Stat(true, eStat.HERO_ATK_SPD, skilldata.f_ExtraValue1); break;
case eSkillEnhance.CRI_Up: Set_Stat(true, eStat.CRI, skilldata.f_ExtraValue1); break;
case eSkillEnhance.DMG_TO_HP: Set_Stat(true, eStat.DMG_TO_HP, skilldata.f_ExtraValue1); break;
}
}
}