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

shaga 보스 완료

This commit is contained in:
Ino 2025-02-27 09:42:29 +09:00
parent 35f9563fdd
commit 828688c021
18 changed files with 620 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/ResWork/Suriyun/Monster Pack Forest 2/Animations/Shaga/Anim_Shaga@boss_skill2attack.fbx Normal file
View File

Binary file not shown.

141
Assets/ResWork/Suriyun/Monster Pack Forest 2/Animations/Shaga/Anim_Shaga@boss_skill2attack.fbx.meta Normal file
View File

@ -0,0 +1,141 @@
fileFormatVersion: 2
guid: 460ae66f5505f8f44be0379b0bfcb07f
ModelImporter:
serializedVersion: 22200
internalIDToNameTable:
- first:
74: -5489899105608494838
second: boss_skill2attack
externalObjects: {}
materials:
materialImportMode: 1
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 1
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations:
- serializedVersion: 16
name: boss_skill2attack
takeName: Anim_Shaga@Attack
internalID: 0
firstFrame: 61
lastFrame: 78
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 1
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask: []
maskType: 3
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 61
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
nodeNameCollisionStrategy: 0
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 0
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
strictVertexDataChecks: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 0
importBlendShapeDeformPercent: 0
remapMaterialsIfMaterialImportModeIsNone: 1
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/ResWork/Suriyun/Monster Pack Forest 2/Animations/Shaga/Anim_Shaga@boss_skill2charging.fbx Normal file
View File

Binary file not shown.

141
Assets/ResWork/Suriyun/Monster Pack Forest 2/Animations/Shaga/Anim_Shaga@boss_skill2charging.fbx.meta Normal file
View File

@ -0,0 +1,141 @@
fileFormatVersion: 2
guid: 103888236b05ff94db3d08c8d447bcea
ModelImporter:
serializedVersion: 22200
internalIDToNameTable:
- first:
74: 6393613354751109690
second: boss_skill2charging
externalObjects: {}
materials:
materialImportMode: 1
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations:
- serializedVersion: 16
name: boss_skill2charging
takeName: Anim_Shaga@Idle
internalID: 0
firstFrame: 1
lastFrame: 24
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 1
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask: []
maskType: 3
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
nodeNameCollisionStrategy: 0
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 0
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
strictVertexDataChecks: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 0
importBlendShapeDeformPercent: 0
remapMaterialsIfMaterialImportModeIsNone: 1
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

83
Assets/ResWork/Suriyun/Monster Pack Forest 2/Animations/Shaga/Forest_Shaga_Boss.controller
View File

@ -186,6 +186,12 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: 1214431828715795864}
m_Position: {x: 120, y: -140, z: 0}
- serializedVersion: 1
m_State: {fileID: 6593277899388615879}
m_Position: {x: 120, y: -90, z: 0}
- serializedVersion: 1
m_State: {fileID: 3918633906253743732}
m_Position: {x: 120, y: -40, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@ -243,6 +249,56 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &3001901881646403970
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 110209958}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.6470588
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &3918633906253743732
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: boss_skill2attack
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 3001901881646403970}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: -5489899105608494838, guid: 460ae66f5505f8f44be0379b0bfcb07f,
type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &4778026026078689383
AnimatorStateTransition:
m_ObjectHideFlags: 1
@ -265,6 +321,33 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &6593277899388615879
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: boss_skill2charging
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 6393613354751109690, guid: 103888236b05ff94db3d08c8d447bcea,
type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &8652537664410932935
AnimatorStateTransition:
m_ObjectHideFlags: 1

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

Binary file not shown.

193
Assets/Res_Addr/Effect/Effect_Shaga_Charging.prefab Normal file
View File

@ -0,0 +1,193 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1380238739168988
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4504870314295858}
- component: {fileID: 5721183518784682466}
m_Layer: 0
m_Name: Effect_Shaga_Charging
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4504870314295858
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1380238739168988}
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: 4366480109533765599}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &5721183518784682466
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1380238739168988}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 456d2bd1c5c2e5e4b8b948836c4975a4, type: 3}
m_Name:
m_EditorClassIdentifier:
NoUseParticleTime: 1
OffTime: 5
e_EffectLocation: 2
--- !u!1001 &4366018842028703375
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 4504870314295858}
m_Modifications:
- target: {fileID: 1182614328576822, guid: 1205099e4d473fd46a9de5fcc1037aaa, type: 3}
propertyPath: m_Name
value: Magic circle 9
objectReference: {fileID: 0}
- target: {fileID: 4483290175758672, guid: 1205099e4d473fd46a9de5fcc1037aaa, type: 3}
propertyPath: m_LocalScale.x
value: 1.1
objectReference: {fileID: 0}
- target: {fileID: 4483290175758672, guid: 1205099e4d473fd46a9de5fcc1037aaa, type: 3}
propertyPath: m_LocalScale.y
value: 1.1
objectReference: {fileID: 0}
- target: {fileID: 4483290175758672, guid: 1205099e4d473fd46a9de5fcc1037aaa, type: 3}
propertyPath: m_LocalScale.z
value: 1.1
objectReference: {fileID: 0}
- target: {fileID: 4483290175758672, guid: 1205099e4d473fd46a9de5fcc1037aaa, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4483290175758672, guid: 1205099e4d473fd46a9de5fcc1037aaa, type: 3}
propertyPath: m_LocalPosition.y
value: 0.01
objectReference: {fileID: 0}
- target: {fileID: 4483290175758672, guid: 1205099e4d473fd46a9de5fcc1037aaa, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4483290175758672, guid: 1205099e4d473fd46a9de5fcc1037aaa, type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 4483290175758672, guid: 1205099e4d473fd46a9de5fcc1037aaa, type: 3}
propertyPath: m_LocalRotation.x
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: 4483290175758672, guid: 1205099e4d473fd46a9de5fcc1037aaa, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4483290175758672, guid: 1205099e4d473fd46a9de5fcc1037aaa, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4483290175758672, guid: 1205099e4d473fd46a9de5fcc1037aaa, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -90
objectReference: {fileID: 0}
- target: {fileID: 4483290175758672, guid: 1205099e4d473fd46a9de5fcc1037aaa, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4483290175758672, guid: 1205099e4d473fd46a9de5fcc1037aaa, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 199379528672491648, guid: 1205099e4d473fd46a9de5fcc1037aaa,
type: 3}
propertyPath: m_Materials.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 199401829107614472, guid: 1205099e4d473fd46a9de5fcc1037aaa,
type: 3}
propertyPath: m_Materials.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 199463191918037300, guid: 1205099e4d473fd46a9de5fcc1037aaa,
type: 3}
propertyPath: m_Materials.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 199536910430389618, guid: 1205099e4d473fd46a9de5fcc1037aaa,
type: 3}
propertyPath: m_Materials.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 199628691627704018, guid: 1205099e4d473fd46a9de5fcc1037aaa,
type: 3}
propertyPath: m_Materials.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 199807678022466288, guid: 1205099e4d473fd46a9de5fcc1037aaa,
type: 3}
propertyPath: m_Materials.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 199874118704243784, guid: 1205099e4d473fd46a9de5fcc1037aaa,
type: 3}
propertyPath: m_Materials.Array.size
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 1556889908395958, guid: 1205099e4d473fd46a9de5fcc1037aaa,
type: 3}
insertIndex: -1
addedObject: {fileID: 4365948904870425693}
m_SourcePrefab: {fileID: 100100000, guid: 1205099e4d473fd46a9de5fcc1037aaa, type: 3}
--- !u!1 &4364745579284775225 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1556889908395958, guid: 1205099e4d473fd46a9de5fcc1037aaa,
type: 3}
m_PrefabInstance: {fileID: 4366018842028703375}
m_PrefabAsset: {fileID: 0}
--- !u!114 &4365948904870425693
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4364745579284775225}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Version: 3
m_UsePipelineSettings: 1
m_AdditionalLightsShadowResolutionTier: 2
m_LightLayerMask: 1
m_RenderingLayers: 1
m_CustomShadowLayers: 0
m_ShadowLayerMask: 1
m_ShadowRenderingLayers: 1
m_LightCookieSize: {x: 1, y: 1}
m_LightCookieOffset: {x: 0, y: 0}
m_SoftShadowQuality: 0
--- !u!4 &4366480109533765599 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4483290175758672, guid: 1205099e4d473fd46a9de5fcc1037aaa,
type: 3}
m_PrefabInstance: {fileID: 4366018842028703375}
m_PrefabAsset: {fileID: 0}

9
Assets/Res_Addr/Effect/Effect_Shaga_Charging.prefab.meta Normal file
View File

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: a8279ebe015498040bfd320a038f8792
timeCreated: 1587080156
licenseType: Store
NativeFormatImporter:
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:

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

@ -97,7 +97,6 @@ public class Actor : MyCoroutine
dic_skillextra[key] = false;
foreach (var key in dic_CCEffect.Keys.ToList())
dic_CCEffect[key].Off_Imm();
NoDmgTime = 0f;
}
protected void Check_CCAddRate(eCC cc, Actor actor, double v = 0)
{

4
Assets/Script/Character/Mob/Boss/Boss_Angez_B.cs
View File

@ -32,9 +32,9 @@ public class Boss_Angez_B : BossMobActor
SkillListTableData m_Stun1 = new SkillListTableData { e_SkillExtraType = eSkillExtraType.Stun, f_ExtraValue4 = 1f };
SkillListTableData m_Stun2 = new SkillListTableData { e_SkillExtraType = eSkillExtraType.Stun, f_ExtraValue4 = 1f };
public override void Set(MonsterTableData mobtable, Vector3 pos, Action<int> actDie, int order)
public override void Set(MonsterTableData mobtable, Vector3 pos, Action<int> actDie, int order, float noDmgTime = 0f)
{
base.Set(mobtable, pos, actDie, order);
base.Set(mobtable, pos, actDie, order, noDmgTime);
Load_Indicator("BossAngez_B_Skill1_Indicator", 0);
Load_Indicator("BossAngez_B_Skill2_Indicator", 1);

4
Assets/Script/Character/Mob/Boss/Boss_Angez_C.cs
View File

@ -27,9 +27,9 @@ public class Boss_Angez_C : BossMobActor
SkillListTableData m_Burn = new SkillListTableData { e_SkillExtraType = eSkillExtraType.Burn, f_ExtraValue4 = 1f };
public override void Set(MonsterTableData mobtable, Vector3 pos, Action<int> actDie, int order)
public override void Set(MonsterTableData mobtable, Vector3 pos, Action<int> actDie, int order, float noDmgTime = 0f)
{
base.Set(mobtable, pos, actDie, order);
base.Set(mobtable, pos, actDie, order, noDmgTime);
Load_Indicator("BossAngez_C_Skill1_Indicator", 0);
Load_Indicator("BossAngez_C_Skill2_Indicator", 1);

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

@ -26,9 +26,9 @@ public class Boss_Anubis : BossMobActor
[Header("스킬2 투사체 속도")]
public float Skill2Speed = 15f;
public override void Set(MonsterTableData mobtable, Vector3 pos, Action<int> actDie, int order)
public override void Set(MonsterTableData mobtable, Vector3 pos, Action<int> actDie, int order, float noDmgTime = 0f)
{
base.Set(mobtable, pos, actDie, order);
base.Set(mobtable, pos, actDie, order, noDmgTime);
CoolTime_Skill1 = 1f;
CoolTime_Skill2 = 2f;

4
Assets/Script/Character/Mob/Boss/Boss_BrotherPenguin.cs
View File

@ -29,9 +29,9 @@ public class Boss_BrotherPenguin : BossMobActor
SkillListTableData m_Frost = new SkillListTableData { e_SkillExtraType = eSkillExtraType.Frost, f_ExtraValue4 = 1f };
SkillListTableData m_Barrier = new SkillListTableData { e_SkillExtraType = eSkillExtraType.Barrier };
public override void Set(MonsterTableData mobtable, Vector3 pos, Action<int> actDie, int order)
public override void Set(MonsterTableData mobtable, Vector3 pos, Action<int> actDie, int order, float noDmgTime = 0f)
{
base.Set(mobtable, pos, actDie, order);
base.Set(mobtable, pos, actDie, order, noDmgTime);
Load_Indicator("BrotherPenguin_Skill1_Indicator", 0);

4
Assets/Script/Character/Mob/Boss/Boss_FlowerDryad.cs
View File

@ -33,9 +33,9 @@ public class Boss_FlowerDryad : BossMobActor
SkillListTableData m_Poison = new SkillListTableData { e_SkillExtraType = eSkillExtraType.Poison, f_ExtraValue4 = 1f };
public override void Set(MonsterTableData mobtable, Vector3 pos, Action<int> actDie, int order)
public override void Set(MonsterTableData mobtable, Vector3 pos, Action<int> actDie, int order, float noDmgTime = 0f)
{
base.Set(mobtable, pos, actDie, order);
base.Set(mobtable, pos, actDie, order, noDmgTime);
Load_Indicator("BossFlowerDryad_Skill2_Indicator", 0);

4
Assets/Script/Character/Mob/Boss/Boss_GolemChild.cs
View File

@ -26,9 +26,9 @@ public class Boss_GolemChild : BossMobActor
ProjectileBase pb_Lock, pb_LockExp;
public override void Set(MonsterTableData mobtable, Vector3 pos, Action<int> actDie, int order)
public override void Set(MonsterTableData mobtable, Vector3 pos, Action<int> actDie, int order, float noDmgTime = 0f)
{
base.Set(mobtable, pos, actDie, order);
base.Set(mobtable, pos, actDie, order, noDmgTime);
Load_Indicator(Skill1Indicator, 0);
Load_Indicator(Skill2Indicator, 1);

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

@ -23,9 +23,9 @@ public class Boss_QueenUndead : BossMobActor
SkillListTableData m_SilenceCurse = new SkillListTableData { e_SkillExtraType = eSkillExtraType.SilenceCurse, f_ExtraValue4 = 1f };
public override void Set(MonsterTableData mobtable, Vector3 pos, Action<int> actDie, int order)
public override void Set(MonsterTableData mobtable, Vector3 pos, Action<int> actDie, int order, float noDmgTime = 0f)
{
base.Set(mobtable, pos, actDie, order);
base.Set(mobtable, pos, actDie, order, noDmgTime);
m_SilenceCurse.f_ExtraValue1 = Skill1LifeTime;
m_SilenceCurse.f_ExtraValue2 = Skill1Manaburn;

50
Assets/Script/Character/Mob/Boss/Boss_Shaga.cs
View File

@ -1,6 +1,7 @@
using System;
using System.Collections;
using UnityEngine;
using WebSocketSharp;
public class Boss_Shaga : BossMobActor
{
@ -18,6 +19,12 @@ public class Boss_Shaga : BossMobActor
public bool Perforation_Line;
[Header("스킬2 쿨타임")]
public float Skill2CoolTime = 20f;
[Header("스킬2 쿨타임")]
public float Skill2ChargingTime = 3f;
[Header("스킬2 소환물 유지 시간")]
public float Skill2SummonLifeTime = 12f;
[Header("스킬2 소환 몬스터 ID")]
public int Skill2SummonMobID = 176;
[Header("스킬2 소환 갯수")]
public int Skill2SummonCount = 2;
[Header("스킬2 스탯 계승")]
@ -25,9 +32,9 @@ public class Boss_Shaga : BossMobActor
SkillListTableData m_Frost = new SkillListTableData { e_SkillExtraType = eSkillExtraType.Frost, f_ExtraValue4 = 1f };
public override void Set(MonsterTableData mobtable, Vector3 pos, Action<int> actDie, int order)
public override void Set(MonsterTableData mobtable, Vector3 pos, Action<int> actDie, int order, float noDmgTime = 0f)
{
base.Set(mobtable, pos, actDie, order);
base.Set(mobtable, pos, actDie, order, noDmgTime);
Load_Indicator("BossShaga_Skill1_Indicator", 0);
@ -53,8 +60,8 @@ public class Boss_Shaga : BossMobActor
if (UseSkillIndex == 1 && MobStatus != eMobStatus.Skill)
StartCoroutine(Co_Skill1());
//else if (UseSkillIndex == 2 && MobStatus != eMobStatus.Skill)
// StartCoroutine(Co_Skill2());
else if (UseSkillIndex == 2 && MobStatus != eMobStatus.Skill)
StartCoroutine(Co_Skill2());
}
IEnumerator Co_Skill1()
@ -86,24 +93,39 @@ public class Boss_Shaga : BossMobActor
pd.m_SkillListTableData = m_Frost;
});
});
//var pd = pb.Get_ProjectTileData();
//pd.e_SkillExtraType = m_Frost.e_SkillExtraType;
//pd.m_skillTypeConfigTable = table_skilltypeconfig.Ins.Get_Data_orNull(pd.e_SkillExtraType);
//pd.m_SkillListTableData = m_Frost;
}
IEnumerator Co_Skill2()
{
Change_MobStatus(eMobStatus.Skill);
AnimationPlay("boss_skill2");
AnimationPlay("boss_skill2charging");
InGameInfo.Ins.Show_Effect("Effect_Shaga_Charging", this, eEffectLocation.Bottom, Skill2ChargingTime);
yield return new WaitForSeconds(0.25f);
yield return new WaitForSeconds(Skill2ChargingTime);
AnimationPlay("boss_skill2attack");
// 무적 상태의 소환물 2기 소환
var mobData = table_monsterlist.Ins.Get_Data_orNull(Skill2SummonMobID);
for (int i = 0; i < Skill2SummonCount; i++)
{
AddrResourceMgr.Ins.LoadObject<GameObject>(mobData.s_MonsterPrefab, handle =>
{
var mob = DSUtil.Get_Clone<MobActor>(handle.Result, transform.parent);
AddrResourceMgr.Ins.Set_AddressableReleaseSelf(mob.gameObject);
ActorInfo.Ins.Add_Actor(mob, eRole.Mob, m_MonsterAppearData.n_SpawnerID, mobData.s_MonsterPrefab);
mob.Set(true, null, null, m_MonsterAppearData.n_SpawnerID, false);
mob.Set(mobData, DSUtil.Get_RandomPos_onNavMesh(Get_position(), 2f), null, 0, Skill2SummonLifeTime);
mob.m_SubRole = eSubRol.Summon;
mob.On_Regen();
mob.Get_StatInfo().Reset_byStatInfo(Get_StatInfo(), Skill2StatRate);
list_summon.Add(mob);
});
}
yield return new WaitForSeconds(0.25f);
yield return new WaitForSeconds(0.5f);
Check_Battle();
//yield return new WaitForSeconds(Skill2LifeTime);
Init(false, true);
yield return new WaitForSeconds(Skill2SummonLifeTime - 0.5f);
list_summon.ForEach(f => f.Off());
}
}

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

@ -25,7 +25,7 @@ public class MobActor : Actor
protected NoSeeLongDMob m_NoSeeLongDMob;
bool useMeeleAttackPos;
bool isNSLDMob;
List<Actor> list_summon = new List<Actor>();
protected List<Actor> list_summon = new List<Actor>();
protected override void Start()
{
@ -59,11 +59,12 @@ public class MobActor : Actor
#endif
Set_Warp(Get_position());
}
public virtual void Set(MonsterTableData mobtable, Vector3 pos, Action<int> actDie, int order)
public virtual void Set(MonsterTableData mobtable, Vector3 pos, Action<int> actDie, int order, float noDmgTime = 0f)
{
m_Role = eRole.Mob;
m_SubRole = mobtable.e_MonsterType;
m_actDie = actDie;
NoDmgTime = noDmgTime;
bool IsBoss = IsSubRole(eSubRol.Boss);
m_MonsterTableData = mobtable;
transform.localScale = m_MonsterTableData.f_DefaultScale * Vector3.one;