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

Cute_OctopusCa, Cute_OctopusCb, 배리어 추가

This commit is contained in:
Ino 2025-02-13 10:13:22 +09:00
parent 2a69cbeb46
commit 1960c748e6
30 changed files with 872 additions and 16 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

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.

139
Assets/Res_Addr/Effect/Effect_Barrier.prefab Normal file
View File

@ -0,0 +1,139 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &100004
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 400004}
- component: {fileID: -3676690579904897150}
m_Layer: 0
m_Name: Effect_Barrier
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &400004
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 100004}
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: 943967664197116751}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &-3676690579904897150
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 100004}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 456d2bd1c5c2e5e4b8b948836c4975a4, type: 3}
m_Name:
m_EditorClassIdentifier:
NoUseParticleTime: 1
OffTime: 5
e_EffectLocation: 0
--- !u!1001 &475121349789390358
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 400004}
m_Modifications:
- target: {fileID: 832706126772057433, guid: 9f846d7ec905d3e4aad4dbdf581885ab,
type: 3}
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 832706126772057433, guid: 9f846d7ec905d3e4aad4dbdf581885ab,
type: 3}
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 832706126772057433, guid: 9f846d7ec905d3e4aad4dbdf581885ab,
type: 3}
propertyPath: m_LocalScale.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: 832706126772057433, guid: 9f846d7ec905d3e4aad4dbdf581885ab,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 832706126772057433, guid: 9f846d7ec905d3e4aad4dbdf581885ab,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 832706126772057433, guid: 9f846d7ec905d3e4aad4dbdf581885ab,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 832706126772057433, guid: 9f846d7ec905d3e4aad4dbdf581885ab,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 832706126772057433, guid: 9f846d7ec905d3e4aad4dbdf581885ab,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 832706126772057433, guid: 9f846d7ec905d3e4aad4dbdf581885ab,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 832706126772057433, guid: 9f846d7ec905d3e4aad4dbdf581885ab,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 832706126772057433, guid: 9f846d7ec905d3e4aad4dbdf581885ab,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 832706126772057433, guid: 9f846d7ec905d3e4aad4dbdf581885ab,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 832706126772057433, guid: 9f846d7ec905d3e4aad4dbdf581885ab,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9073731244664770521, guid: 9f846d7ec905d3e4aad4dbdf581885ab,
type: 3}
propertyPath: m_Name
value: BluePolygonShield
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9f846d7ec905d3e4aad4dbdf581885ab, type: 3}
--- !u!4 &943967664197116751 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 832706126772057433, guid: 9f846d7ec905d3e4aad4dbdf581885ab,
type: 3}
m_PrefabInstance: {fileID: 475121349789390358}
m_PrefabAsset: {fileID: 0}

4
Assets/Res_Addr/Effect/Effect_Barrier.prefab.meta Normal file
View File

@ -0,0 +1,4 @@
fileFormatVersion: 2
guid: 7af759bb5399d94449a09ab23c19010d
NativeFormatImporter:
userData:

0
Assets/Res_Addr/Mobs/Mob/Cute_OctopusCa.prefab → Assets/Res_Addr/Mobs/Elite/Cute_OctopusCa.prefab
View File

0
Assets/Res_Addr/Mobs/Mob/Cute_OctopusCa.prefab.meta → Assets/Res_Addr/Mobs/Elite/Cute_OctopusCa.prefab.meta
View File

0
Assets/Res_Addr/Mobs/Mob/Cute_OctopusCb.prefab → Assets/Res_Addr/Mobs/Elite/Cute_OctopusCb.prefab
View File

0
Assets/Res_Addr/Mobs/Mob/Cute_OctopusCb.prefab.meta → Assets/Res_Addr/Mobs/Elite/Cute_OctopusCb.prefab.meta
View File

0
Assets/Res_Addr/Mobs/Mob/Cute_OctopusCc.prefab → Assets/Res_Addr/Mobs/Elite/Cute_OctopusCc.prefab
View File

0
Assets/Res_Addr/Mobs/Mob/Cute_OctopusCc.prefab.meta → Assets/Res_Addr/Mobs/Elite/Cute_OctopusCc.prefab.meta
View File

0
Assets/Res_Addr/Mobs/Mob/Cute_OctopusCd.prefab → Assets/Res_Addr/Mobs/Elite/Cute_OctopusCd.prefab
View File

0
Assets/Res_Addr/Mobs/Mob/Cute_OctopusCd.prefab.meta → Assets/Res_Addr/Mobs/Elite/Cute_OctopusCd.prefab.meta
View File

147
Assets/Res_Addr/Projectile/Elite/P_Cute_OctopusCa.prefab Normal file
View File

@ -0,0 +1,147 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1079946990457772
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4494156932542222}
- component: {fileID: 4995618328429827743}
- component: {fileID: 8527147724218912786}
m_Layer: 0
m_Name: P_Cute_OctopusCa
m_TagString: Projectile
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4494156932542222
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1079946990457772}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 1, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3818737058906301661}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &4995618328429827743
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1079946990457772}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b3062df6743c3a048910d52c2f80e25b, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Pierce: 0
str_HitEffect: Effect_Hit_Electronic
m_ShowTimeOverEffect: 1
m_Direction: 0
--- !u!65 &8527147724218912786
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1079946990457772}
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: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1001 &6830086858653494240
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 4494156932542222}
m_Modifications:
- target: {fileID: 7653787099927154482, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_Name
value: Projectiles_electric
objectReference: {fileID: 0}
- target: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: db5486219ba247746b2df5fe8cfb8119, type: 3}
--- !u!4 &3818737058906301661 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
m_PrefabInstance: {fileID: 6830086858653494240}
m_PrefabAsset: {fileID: 0}

8
Assets/Res_Addr/Projectile/Elite/P_Cute_OctopusCa.prefab.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 4d531f23746e6674eb41791b44a974cc
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:

147
Assets/Res_Addr/Projectile/Elite/P_Cute_OctopusCb.prefab Normal file
View File

@ -0,0 +1,147 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1079946990457772
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4494156932542222}
- component: {fileID: 4995618328429827743}
- component: {fileID: 8527147724218912786}
m_Layer: 0
m_Name: P_Cute_OctopusCb
m_TagString: Projectile
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4494156932542222
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1079946990457772}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 1, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3818737058906301661}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &4995618328429827743
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1079946990457772}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b3062df6743c3a048910d52c2f80e25b, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Pierce: 0
str_HitEffect: Effect_Hit_Electronic
m_ShowTimeOverEffect: 1
m_Direction: 0
--- !u!65 &8527147724218912786
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1079946990457772}
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: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1001 &6830086858653494240
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 4494156932542222}
m_Modifications:
- target: {fileID: 7653787099927154482, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_Name
value: Projectiles_electric
objectReference: {fileID: 0}
- target: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: db5486219ba247746b2df5fe8cfb8119, type: 3}
--- !u!4 &3818737058906301661 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
m_PrefabInstance: {fileID: 6830086858653494240}
m_PrefabAsset: {fileID: 0}

8
Assets/Res_Addr/Projectile/Elite/P_Cute_OctopusCb.prefab.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: ab77159b2beee81489a122160d221d28
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:

147
Assets/Res_Addr/Projectile/Elite/P_Cute_OctopusCc.prefab Normal file
View File

@ -0,0 +1,147 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1079946990457772
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4494156932542222}
- component: {fileID: 4995618328429827743}
- component: {fileID: 8527147724218912786}
m_Layer: 0
m_Name: P_Cute_OctopusCc
m_TagString: Projectile
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4494156932542222
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1079946990457772}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 1, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3818737058906301661}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &4995618328429827743
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1079946990457772}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b3062df6743c3a048910d52c2f80e25b, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Pierce: 0
str_HitEffect: Effect_Hit_Electronic
m_ShowTimeOverEffect: 1
m_Direction: 0
--- !u!65 &8527147724218912786
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1079946990457772}
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: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1001 &6830086858653494240
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 4494156932542222}
m_Modifications:
- target: {fileID: 7653787099927154482, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_Name
value: Projectiles_electric
objectReference: {fileID: 0}
- target: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: db5486219ba247746b2df5fe8cfb8119, type: 3}
--- !u!4 &3818737058906301661 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
m_PrefabInstance: {fileID: 6830086858653494240}
m_PrefabAsset: {fileID: 0}

8
Assets/Res_Addr/Projectile/Elite/P_Cute_OctopusCc.prefab.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 6227ecf92a3ffe449ad710ad8b654347
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:

147
Assets/Res_Addr/Projectile/Elite/P_Cute_OctopusCd.prefab Normal file
View File

@ -0,0 +1,147 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1079946990457772
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4494156932542222}
- component: {fileID: 4995618328429827743}
- component: {fileID: 8527147724218912786}
m_Layer: 0
m_Name: P_Cute_OctopusCd
m_TagString: Projectile
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4494156932542222
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1079946990457772}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 1, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3818737058906301661}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &4995618328429827743
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1079946990457772}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b3062df6743c3a048910d52c2f80e25b, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Pierce: 0
str_HitEffect: Effect_Hit_Electronic
m_ShowTimeOverEffect: 1
m_Direction: 0
--- !u!65 &8527147724218912786
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1079946990457772}
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: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1001 &6830086858653494240
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 4494156932542222}
m_Modifications:
- target: {fileID: 7653787099927154482, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_Name
value: Projectiles_electric
objectReference: {fileID: 0}
- target: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: db5486219ba247746b2df5fe8cfb8119, type: 3}
--- !u!4 &3818737058906301661 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7653787099927154493, guid: db5486219ba247746b2df5fe8cfb8119,
type: 3}
m_PrefabInstance: {fileID: 6830086858653494240}
m_PrefabAsset: {fileID: 0}

8
Assets/Res_Addr/Projectile/Elite/P_Cute_OctopusCd.prefab.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f847d596ee1e28440ac1f12d12667299
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:

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

@ -63,7 +63,8 @@ public class Actor : MyCoroutine
protected ServerData m_ServerData;
protected Renderer[] arr_Renderer;
protected TurnOff_GO[] arr_Effects;
protected Dictionary<eSkillExtraType, bool> dic_skillextra = new Dictionary<eSkillExtraType, bool>();
protected Dictionary<eSkillExtraType, bool> dic_skillextra = new Dictionary<eSkillExtraType, bool>(); // 부가 효과 적용 여부
protected Dictionary<eSkillExtraType, int> dic_skillextraCount = new Dictionary<eSkillExtraType, int>(); // 부가 효과 적용 여부
protected Dictionary<eCC, CCData> dic_ccData = new Dictionary<eCC, CCData>();
protected Dictionary<eCC, Dictionary<Actor, double>> dic_ccAddRate = new Dictionary<eCC, Dictionary<Actor, double>>();
protected Dictionary<eCC, TurnOff_GO> dic_CCEffect = new Dictionary<eCC, TurnOff_GO>();
@ -438,6 +439,7 @@ public class Actor : MyCoroutine
Cal_Damage(_dinfo);
Check_CC_byAttack(_dinfo);
Check_Extra();
#if UNITY_EDITOR
if (SceneManager.GetActiveScene().name == "StatTest")
@ -458,7 +460,22 @@ public class Actor : MyCoroutine
DungeonInfo.Ins.Add_TotalDmg(_dinfo.Damage * addmul);
}
else
m_Stat.Set_Stat(false, eStat.HP, _dinfo.Damage);
{
if (dic_ccData[eCC.Barrier].CCDmg > 0)
{ // 배리어가 있으면 배리어부터 계산
_dinfo.TextColor = "Barrier";
dic_ccData[eCC.Barrier].CCDmg -= _dinfo.Damage;
if (dic_ccData[eCC.Barrier].CCDmg <= 0)
{ // 배리어를 넘어가는 데미지 계산
var dmg = Math.Abs(dic_ccData[eCC.Barrier].CCDmg);
if (dmg > 0) m_Stat.Set_Stat(false, eStat.HP, dmg);
dic_ccData[eCC.Barrier].CCDmg = 0;
dic_CCEffect[eCC.Barrier].Off_Imm();
}
}
else
m_Stat.Set_Stat(false, eStat.HP, _dinfo.Damage);
}
_dinfo.act_returnLastDmg?.Invoke(_dinfo.Damage);
_dinfo.act_CriAfterHit?.Invoke(_dinfo.Critical);
@ -991,7 +1008,7 @@ public class Actor : MyCoroutine
}
}
}
protected virtual void Check_Extra() { }
public void Check_Extra(DamageInfo _dinfo)
{
var pd = _dinfo.Beater_pd;

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

@ -1,7 +1,10 @@
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.SceneManagement;
using UnityEngine.UIElements;
using static UILabel;
public enum eMobStatus { None, PatrolWait, PatrolRot, Patroling, Battle, BattleStop, Attack, Chase }
@ -17,6 +20,7 @@ public class MobActor : Actor
bool b_IsFirstAttack, NoUpdate_byTool;
protected MonsterAppearData m_MonsterAppearData;
protected MonsterTableData m_MonsterTableData;
protected Dictionary<SkillListTableData, int> dic_skill = new Dictionary<SkillListTableData, int>();
Action<int> m_actDie;
protected MobMark m_MobMark;
protected NoSeeLongDMob m_NoSeeLongDMob;
@ -60,9 +64,8 @@ public class MobActor : Actor
m_actDie = actDie;
bool IsBoss = IsSubRole(eSubRol.Boss);
m_MonsterTableData = mobtable;
var scale = m_MonsterTableData.f_DefaultScale;
if (!DSUtil.CheckNull(m_MonsterTableData)) transform.localScale = scale * Vector3.one;
if (!IsBoss) IsBoss = scale > 2f;
transform.localScale = m_MonsterTableData.f_DefaultScale * Vector3.one;
Reset_Extra();
m_AttackType = m_MonsterTableData.e_AttackType;
b_IsFirstAttack = m_MonsterTableData.b_IsFirstAttack;
@ -108,6 +111,7 @@ public class MobActor : Actor
Set_Warp(OriginalPos);
Change_MobStatus(eMobStatus.PatrolWait);
InGameInfo.Ins.Show_Effect("Effect_MonsterSpawn", Get_position());
Reset_Extra();
}
protected override void Awake()
@ -276,6 +280,7 @@ public class MobActor : Actor
Del_Target();
Play_Idle();
StopMove_Imm(true);
Reset_Extra();
break;
case eMobStatus.Attack:
break;
@ -539,6 +544,73 @@ public class MobActor : Actor
m_MonsterTableData.f_ProjectileLifeTime1);
}
protected override void Check_Extra()
{
base.Check_Extra();
// Dictionary의 Key를 배열로 가져오기 (복사본을 사용하여 수정 방지)
var keys = new List<SkillListTableData>(dic_skill.Keys);
for (int i = 0; i < keys.Count; i++)
{
var temp = keys[i];
var skilltype = table_skilltypeconfig.Ins.Get_Data_orNull(temp.e_SkillExtraType);
if (skilltype.e_SkillExtraTiming == eSkillExtraTiming.GetHit)
{
switch (skilltype.e_SkillExtraType)
{
case eSkillExtraType.Barrier: // 배리어 On
if (dic_skill[temp] > 0) // Dictionary 직접 접근
{
var conditionHP = Get_MaxHP() * temp.f_ExtraValue1;
if (conditionHP >= Get_HP())
{
dic_skill[temp] = 0; // Dictionary 수정 가능
dic_skillextra[skilltype.e_SkillExtraType] = true;
InGameInfo.Ins.Show_Effect(skilltype.e_SkillEffect, this, skilltype.e_EffectLocation, 10000,
effect =>
{
if (!dic_CCEffect.ContainsKey(eCC.Barrier))
dic_CCEffect.Add(eCC.Barrier, null);
dic_CCEffect[eCC.Barrier] = effect;
dic_ccData[eCC.Barrier].CCDmg = Get_MaxHP() * temp.f_ExtraValue2;
});
}
}
break;
}
}
}
}
void Reset_Extra()
{
// 1. 패시브 스킬이 존재하는지 확인
if (m_MonsterTableData.n_PassiveSkillID <= 0)
return;
var pSkill = table_skilllist.Ins.Get_Data_orNull(m_MonsterTableData.n_PassiveSkillID);
// 2. dic_skill에 추가할 때 예외 방지
if (!dic_skill.ContainsKey(pSkill))
dic_skill[pSkill] = 0;
// 3. 배리어 스킬이면 값 초기화
if (pSkill.e_SkillExtraType == eSkillExtraType.Barrier)
{
dic_skill[pSkill] = 1;
// dic_ccData[eCC.Barrier]가 존재하는지 확인 후 초기화
if (dic_ccData.ContainsKey(eCC.Barrier))
dic_ccData[eCC.Barrier].CCDmg = 0;
// dic_CCEffect[eCC.Barrier]가 존재하는지 확인 후 제거
if (dic_CCEffect.ContainsKey(eCC.Barrier) && dic_CCEffect[eCC.Barrier].IsMyEffect(this))
dic_CCEffect[eCC.Barrier].Off_Imm();
}
}
public void Set_NoUpdate_byTool(MonsterTableData mobdata)
{
NoUpdate_byTool = true;

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

@ -358,12 +358,13 @@ public partial class InGameInfo : MyCoroutine
temp.SetActive(true);
});
}
public void Show_Effect(string prefab, Actor actor, eEffectLocation loca, float lifetime)
public void Show_Effect(string prefab, Actor actor, eEffectLocation loca, float lifetime, Action<TurnOff_GO> actEffect = null)
{
Get_Effect(prefab, temp =>
{
var turnoff = temp.GetComponent<TurnOff_GO>();
if (!DSUtil.CheckNull(turnoff)) turnoff.Set(actor, loca, lifetime);
turnoff.Set(actor, loca, lifetime);
actEffect?.Invoke(turnoff);
});
}

2
Assets/Script/Table/Skill/table_skilllist.cs
View File

@ -7,7 +7,7 @@ public enum eSkillType { Active, Passive, JobPassive, MobPassive }
public enum eSkillTarget { Enemy, Self, SelfEnemy, Team, Pet }
public enum eSkillExtraType { None, Frost, Cure, Freezing, Blood, Poison, Burn, Stun, Slow, StatUp, ManaShield, SwordShield,
SpeedUp, DefenceDecrease, Aggro, VampirHeal, Knockback, Airborne, Curse, ManaBurn, HPBurn,
SilenceCurse, }
SilenceCurse, Barrier, }
public class SkillListTableData : TableDataBase
{

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

@ -3,7 +3,10 @@ using CodeStage.AntiCheat.ObscuredTypes;
using Newtonsoft.Json;
public enum eEffectLocation { Top, Mid, Bottom }
public enum eSkillExtraTiming { Start, Hit, Skill }
/// <summary>
/// Start 시전 시, Hit 때릴 때, GetHit 맞을 때, Skill ?
/// </summary>
public enum eSkillExtraTiming { Start, Hit, GetHit, Skill }
public class SkillTypeConfigTableData : TableDataBase
{

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

@ -9,7 +9,7 @@ public enum eSpawnerType { Random, Order, Phase, PhaseAllKill }
public enum eAnim { Idle, Run, Die, Hit, Dodge, Attack, Attack2, Attack3, Attack4, Skill }
public enum eCC { BossDamage, MobDamage, PiercingBuff, ATK_Up, ATKSPD_Up, MOVSPD_Up, ATKSPD_Down, MOVSPD_Down, DEF_Down, M_DEF_Down, // 움직임 자유
STR_Mul_Up, DEX_Mul_Up, INT_Mul_Up, LUK_Mul_Up, Burn, Blooding, Poison, ManaShield, MPRecoverTime, // 움직임 자유
Cri_Up, MultiShot, ATK_Down, SilenceCurse, Aggro, Cure, // 움직임 자유
Cri_Up, MultiShot, ATK_Down, SilenceCurse, Aggro, Cure, Barrier, // 움직임 자유
Freeze, Attract, KnockedAirborne, KnockBack, Stun, // 움직임 제한

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

@ -54,7 +54,7 @@ public class TurnOff_GO : MyCoroutine
}
public bool IsMyEffect(Actor actor)
{
if (followTarget && m_target2 == actor)
if (m_target2 == actor)
return true;
return false;
}