diff --git a/Assets/ResWork/Suriyun/Monster Pack Fire/Animations/Minotos/Anim_Minotos@skill2.fbx b/Assets/ResWork/Suriyun/Monster Pack Fire/Animations/Minotos/Anim_Minotos@skill2.fbx new file mode 100644 index 000000000..0d26442cd Binary files /dev/null and b/Assets/ResWork/Suriyun/Monster Pack Fire/Animations/Minotos/Anim_Minotos@skill2.fbx differ diff --git a/Assets/ResWork/Suriyun/Monster Pack Fire/Animations/Minotos/Anim_Minotos@skill2.fbx.meta b/Assets/ResWork/Suriyun/Monster Pack Fire/Animations/Minotos/Anim_Minotos@skill2.fbx.meta new file mode 100644 index 000000000..60b2192ae --- /dev/null +++ b/Assets/ResWork/Suriyun/Monster Pack Fire/Animations/Minotos/Anim_Minotos@skill2.fbx.meta @@ -0,0 +1,177 @@ +fileFormatVersion: 2 +guid: 391421ca175ee1f4393560bb50e34374 +ModelImporter: + serializedVersion: 23 + fileIDToRecycleName: + 100000: //RootNode + 100002: center + 100004: claw_l1 + 100006: claw_l2 + 100008: claw_l3 + 100010: claw_l4 + 100012: claw_l5 + 100014: claw_l6 + 100016: claw_r1 + 100018: claw_r2 + 100020: claw_r3 + 100022: claw_r4 + 100024: claw_r5 + 100026: claw_r6 + 100028: finger_l1 + 100030: finger_l2 + 100032: finger_l3 + 100034: finger_r1 + 100036: finger_r2 + 100038: finger_r3 + 100040: hand_l + 100042: hand_r + 100044: head + 100046: head_end + 100048: root + 100050: spine1 + 100052: spine2 + 100054: spine3 + 400000: //RootNode + 400002: center + 400004: claw_l1 + 400006: claw_l2 + 400008: claw_l3 + 400010: claw_l4 + 400012: claw_l5 + 400014: claw_l6 + 400016: claw_r1 + 400018: claw_r2 + 400020: claw_r3 + 400022: claw_r4 + 400024: claw_r5 + 400026: claw_r6 + 400028: finger_l1 + 400030: finger_l2 + 400032: finger_l3 + 400034: finger_r1 + 400036: finger_r2 + 400038: finger_r3 + 400040: hand_l + 400042: hand_r + 400044: head + 400046: head_end + 400048: root + 400050: spine1 + 400052: spine2 + 400054: spine3 + 7400000: Damage + 9500000: //RootNode + externalObjects: {} + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 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: Damage + takeName: Anim_Minotos@Damage + firstFrame: 201 + lastFrame: 215 + 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: 0 + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + optimizeMeshForGPU: 1 + keepQuads: 0 + weldVertices: 1 + preserveHierarchy: 0 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + previousCalculatedGlobalScale: 0.01 + hasPreviousCalculatedGlobalScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + importAnimation: 1 + copyAvatar: 0 + humanDescription: + serializedVersion: 2 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 2 + humanoidOversampling: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/Suriyun/Monster Pack Fire/Animations/Minotos/Mintos_Animations_Check.controller b/Assets/ResWork/Suriyun/Monster Pack Fire/Animations/Minotos/Mintos_Animations_Check.controller index 68a1529ec..1d23e0429 100644 --- a/Assets/ResWork/Suriyun/Monster Pack Fire/Animations/Minotos/Mintos_Animations_Check.controller +++ b/Assets/ResWork/Suriyun/Monster Pack Fire/Animations/Minotos/Mintos_Animations_Check.controller @@ -1,5 +1,54 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-9167292428480122705 +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.571429 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-9125726702485892676 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: boss_skill2 + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -9167292428480122705} + 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: 7400000, guid: 391421ca175ee1f4393560bb50e34374, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1101 &-7024161768954648885 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -253,6 +302,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -2027291007709866861} m_Position: {x: 120, y: -140, z: 0} + - serializedVersion: 1 + m_State: {fileID: -9125726702485892676} + m_Position: {x: 120, y: -90, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Assets/ResWork/Table/butler.xlsm b/Assets/ResWork/Table/butler.xlsm index ff4844583..3704e837f 100644 Binary files a/Assets/ResWork/Table/butler.xlsm and b/Assets/ResWork/Table/butler.xlsm differ diff --git a/Assets/Res_Addr/Effect/Effect_MinotosSkill2.prefab b/Assets/Res_Addr/Effect/Effect_MinotosSkill2.prefab new file mode 100644 index 000000000..37d31875f --- /dev/null +++ b/Assets/Res_Addr/Effect/Effect_MinotosSkill2.prefab @@ -0,0 +1,152 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1765570899365652 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4279857972633504} + - component: {fileID: 4138789461419179069} + m_Layer: 0 + m_Name: Effect_MinotosSkill2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4279857972633504 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1765570899365652} + 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: 3353246840108208868} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4138789461419179069 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1765570899365652} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 456d2bd1c5c2e5e4b8b948836c4975a4, type: 3} + m_Name: + m_EditorClassIdentifier: + NoUseParticleTime: 1 + OffTime: 1 + e_EffectLocation: 0 +--- !u!1001 &1696138399892205959 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4279857972633504} + m_Modifications: + - target: {fileID: 1724101358703626232, guid: 6c119b9b00b04394f86df4e4e63dcbc2, + type: 3} + propertyPath: TrailModule.colorOverTrail.maxColor.g + value: 0.991647 + objectReference: {fileID: 0} + - target: {fileID: 1724101358703626232, guid: 6c119b9b00b04394f86df4e4e63dcbc2, + type: 3} + propertyPath: TrailModule.colorOverTrail.maxColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4107499323353244515, guid: 6c119b9b00b04394f86df4e4e63dcbc2, + type: 3} + propertyPath: m_LocalScale.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4107499323353244515, guid: 6c119b9b00b04394f86df4e4e63dcbc2, + type: 3} + propertyPath: m_LocalScale.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4107499323353244515, guid: 6c119b9b00b04394f86df4e4e63dcbc2, + type: 3} + propertyPath: m_LocalScale.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4107499323353244515, guid: 6c119b9b00b04394f86df4e4e63dcbc2, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4107499323353244515, guid: 6c119b9b00b04394f86df4e4e63dcbc2, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4107499323353244515, guid: 6c119b9b00b04394f86df4e4e63dcbc2, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4107499323353244515, guid: 6c119b9b00b04394f86df4e4e63dcbc2, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4107499323353244515, guid: 6c119b9b00b04394f86df4e4e63dcbc2, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4107499323353244515, guid: 6c119b9b00b04394f86df4e4e63dcbc2, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4107499323353244515, guid: 6c119b9b00b04394f86df4e4e63dcbc2, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4107499323353244515, guid: 6c119b9b00b04394f86df4e4e63dcbc2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4107499323353244515, guid: 6c119b9b00b04394f86df4e4e63dcbc2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4107499323353244515, guid: 6c119b9b00b04394f86df4e4e63dcbc2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4672897209852123454, guid: 6c119b9b00b04394f86df4e4e63dcbc2, + type: 3} + propertyPath: m_Name + value: FX_Buff + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: + - {fileID: 5409510084231057802, guid: 6c119b9b00b04394f86df4e4e63dcbc2, type: 3} + - {fileID: 5317708295199703885, guid: 6c119b9b00b04394f86df4e4e63dcbc2, type: 3} + - {fileID: 7509673848271308604, guid: 6c119b9b00b04394f86df4e4e63dcbc2, type: 3} + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6c119b9b00b04394f86df4e4e63dcbc2, type: 3} +--- !u!4 &3353246840108208868 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4107499323353244515, guid: 6c119b9b00b04394f86df4e4e63dcbc2, + type: 3} + m_PrefabInstance: {fileID: 1696138399892205959} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Res_Addr/Effect/Effect_MinotosSkill2.prefab.meta b/Assets/Res_Addr/Effect/Effect_MinotosSkill2.prefab.meta new file mode 100644 index 000000000..050e517d9 --- /dev/null +++ b/Assets/Res_Addr/Effect/Effect_MinotosSkill2.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3c4cf2c3f3dadcf408fdd5ecd7a4a827 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Res_Addr/Projectile/FieldBoss/Lusif_AttackDmg.prefab b/Assets/Res_Addr/Projectile/FieldBoss/Lusif_AttackDmg.prefab index b7ad42113..d71038608 100644 --- a/Assets/Res_Addr/Projectile/FieldBoss/Lusif_AttackDmg.prefab +++ b/Assets/Res_Addr/Projectile/FieldBoss/Lusif_AttackDmg.prefab @@ -45,7 +45,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e5d2fd9d460da6a4d87b4be83a4cdc32, type: 3} m_Name: m_EditorClassIdentifier: - m_Pierce: 0 + m_Pierce: 1 str_HitEffect: m_ShowTimeOverEffect: 1 --- !u!65 &8240083998892309707 diff --git a/Assets/Res_Addr/Projectile/FieldBoss/Minotos_Attack.prefab b/Assets/Res_Addr/Projectile/FieldBoss/Minotos_Attack.prefab index 5d8bf7959..bebc01298 100644 --- a/Assets/Res_Addr/Projectile/FieldBoss/Minotos_Attack.prefab +++ b/Assets/Res_Addr/Projectile/FieldBoss/Minotos_Attack.prefab @@ -30,8 +30,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 6892960396610561222} + m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3392373663720083392 @@ -46,7 +45,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e5d2fd9d460da6a4d87b4be83a4cdc32, type: 3} m_Name: m_EditorClassIdentifier: - m_Pierce: 0 + m_Pierce: 1 str_HitEffect: m_ShowTimeOverEffect: 1 --- !u!65 &8240083998892309707 @@ -70,108 +69,3 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 2, y: 2, z: 5} m_Center: {x: 0, y: 0, z: 0} ---- !u!1 &5648866779330774608 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6892960396610561222} - - component: {fileID: 4229275297670906105} - - component: {fileID: 2668196901627264576} - - component: {fileID: 3598758318326796496} - m_Layer: 0 - m_Name: Cube - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6892960396610561222 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5648866779330774608} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2, y: 1, z: 5} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8021888228437686570} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &4229275297670906105 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5648866779330774608} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &2668196901627264576 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5648866779330774608} - 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: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - 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!65 &3598758318326796496 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5648866779330774608} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Script/Character/Actor.cs b/Assets/Script/Character/Actor.cs index f8e63105c..45919e37d 100644 --- a/Assets/Script/Character/Actor.cs +++ b/Assets/Script/Character/Actor.cs @@ -324,7 +324,7 @@ public class Actor : MyCoroutine if (dic_ccData[eCC.MultiShot].CCTime > 0f) dinfo.BaseDmg -= dinfo.BaseDmg * dic_ccData[eCC.MultiShot].CCDmg; - dinfo.Damage = dinfo.BaseDmg * _pd.AddDmgPercent; + dinfo.NoCriDmg = dinfo.Damage = dinfo.BaseDmg * _pd.AddDmgPercent; dinfo.PiercingDmg = dinfo.BaseDmg * (m_Stat.Get_Stat(eStat.PIERCING_Multiplier) + dinfo.Get_AddValue(eAddExtraType.Add_Piercing_Multiplier_bySpiriBless)); @@ -875,7 +875,6 @@ public class Actor : MyCoroutine public bool IsSubRole(eSubRol subRol) { return m_SubRole == subRol; } public bool IsEnemy() { return m_Enemy; } public virtual bool IsBerserkPet() { return false; } - public virtual bool Get_IsMainPC() { return false; } public bool Get_SelectSkill(eEffect _effect) { if (IsRole(eRole.PC) && !IsEnemy()) diff --git a/Assets/Script/Character/Mob/Boss/Boss_Minotos.cs b/Assets/Script/Character/Mob/Boss/Boss_Minotos.cs index a7be1ac2b..7b40b7bd2 100644 --- a/Assets/Script/Character/Mob/Boss/Boss_Minotos.cs +++ b/Assets/Script/Character/Mob/Boss/Boss_Minotos.cs @@ -1,5 +1,4 @@ using System.Collections; -using System.Collections.Generic; using UnityEngine; public class Boss_Minotos : BossMobActor @@ -11,23 +10,17 @@ public class Boss_Minotos : BossMobActor [Header("---------------------------------------")] public bool Perforation_Line; [Header("스킬2 쿨타임")] - public float Skill2CoolTime = 10f; - [Header("스킬2 달려가는 속도")] - public float Skill2Speed = 7f; - [Header("스킬2 데미지")] - public float Skill2Dmg = 3.5f; - [Header("스킬2 넉백 시간")] - public float Skill2KnockBackTime = 0.3f; - [Header("스킬2 스턴 시간")] - public float Skill2StunTime = 1f; - [Header("스킬2 인디케이터")] - public string Skill2Indicator = "IceGolem_Skill2_Indicator"; + public float Skill2CoolTime = 25f; + [Header("스킬2 지속시간")] + public float Skill2LifeTime = 15f; + [Header("스킬2 이동속도 증가량")] + public float Skill2MoveSpeed = 0.5f; + [Header("스킬2 공격속도 증가량")] + public float Skill2AttackSpeed = 0.5f; public override void Set(bool isEnemy, Actor owner, ServerData sdata, int _id, bool _stop, bool _ui = false) { base.Set(isEnemy, owner, sdata, _id, _stop, _ui); - //if (DSUtil.CheckNull(go_indicator1)) IndicatorInfo.Ins.Make_Indicator(Skill1Indicator, go => { go_indicator1 = go; }); - //if (DSUtil.CheckNull(go_indicator2)) IndicatorInfo.Ins.Make_Indicator(Skill2Indicator, go => { go_indicator2 = go; }); CoolTime_Skill1 = 1f; CoolTime_Skill2 = 2f; @@ -46,13 +39,9 @@ public class Boss_Minotos : BossMobActor if (IsDead() || IsStop) return; if (UseSkillIndex == 1 && MobStatus != eMobStatus.Skill) - { StartCoroutine(Co_Skill1()); - } else if (UseSkillIndex == 2 && MobStatus != eMobStatus.Skill) - { - //Change_MobStatus(eMobStatus.Skill); - } + StartCoroutine(Co_Skill2()); } IEnumerator Co_Skill1() @@ -63,6 +52,17 @@ public class Boss_Minotos : BossMobActor Check_Battle(); Init(true, false); } + IEnumerator Co_Skill2() + { + Change_MobStatus(eMobStatus.Skill); + AnimationPlay("boss_skill2"); + Buff_or_Debuff(eCC.MOVSPD_Up, Skill2LifeTime, Skill2MoveSpeed); + Buff_or_Debuff(eCC.ATKSPD_Up, Skill2LifeTime, Skill2AttackSpeed); + InGameInfo.Ins.Show_Effect("Effect_MinotosSkill2", this, eEffectLocation.Bottom, Skill2LifeTime); + yield return new WaitForSeconds(0.5f); + Check_Battle(); + Init(false, true); + } protected override float Get_Skill1Dmg() { return Skill1Dmg; } protected override Vector3 Get_Skill1Pos() { return Get_Center_position(); } diff --git a/Assets/Script/Character/Mob/BossMobActor.cs b/Assets/Script/Character/Mob/BossMobActor.cs index d98be45cb..ab9de04a6 100644 --- a/Assets/Script/Character/Mob/BossMobActor.cs +++ b/Assets/Script/Character/Mob/BossMobActor.cs @@ -10,6 +10,12 @@ public class BossMobActor : MobActor protected float CoolTime_Skill1, CoolTime_Skill2; protected int UseSkillIndex = 0; + public override void On_Regen(bool reincarnation = false, float healrate = 1) + { + base.On_Regen(reincarnation, healrate); + CanUseSkill1 = CanUseSkill2 = false; + } + protected override void Update() { base.Update(); diff --git a/Assets/Script/Character/Mob/MobActor.cs b/Assets/Script/Character/Mob/MobActor.cs index 10057543c..b821a32be 100644 --- a/Assets/Script/Character/Mob/MobActor.cs +++ b/Assets/Script/Character/Mob/MobActor.cs @@ -394,7 +394,6 @@ public class MobActor : Actor var sdata = ServerInfo.Ins.m_ServerData; if (n_Reincarnation <= 0) { - m_actDie?.Invoke(m_MonsterTableData.n_MonsterID); DungeonInfo.Ins.Add_WaveScore(1); // TODO 정인호 : 웨이브 점수 DungeonInfo.Ins.Add_WaveGold(10); // TODO 정인호 : 웨이브 골드 sdata.Add_CollectionMobKill(m_MonsterTableData.n_MonsterID); @@ -422,6 +421,12 @@ public class MobActor : Actor sdata.Add_MissionCount(MyValue.arr_Mission[1], 1); } } + protected override void After_Die() + { + base.After_Die(); + if (n_Reincarnation == 0) + m_actDie?.Invoke(m_MonsterTableData.n_MonsterID); + } public override void Shoot_Skill() { base.Shoot_Skill(); diff --git a/Assets/Script/Character/PCActor.cs b/Assets/Script/Character/PCActor.cs index b38e07d99..482abf9b1 100644 --- a/Assets/Script/Character/PCActor.cs +++ b/Assets/Script/Character/PCActor.cs @@ -139,6 +139,10 @@ public class PCActor : MyActor { base.ReSet(); Set_Stat(true); + // 테스트 스탯 + m_Stat.Set_Stat(true, eStat.CRI, 1f); + m_Stat.Set_Stat(true, eStat.M_CRI, 1f); + ////////////// t_autoskill = Random.Range(2f, 3f); m_Auto = m_ServerData.Get_Common(eCommon.Auto) == 1; diff --git a/Assets/Script/Character/Projectile/ProjectileBase.cs b/Assets/Script/Character/Projectile/ProjectileBase.cs index d05702364..1785c54a7 100644 --- a/Assets/Script/Character/Projectile/ProjectileBase.cs +++ b/Assets/Script/Character/Projectile/ProjectileBase.cs @@ -287,7 +287,7 @@ public class ProjectileBase : MonoBehaviour } protected DamageInfo Get_DamageInfo(bool extradmg = false, bool calcri = true) { - m_DamageInfo.Damage = m_DamageInfo.Damage; + m_DamageInfo.Damage = m_DamageInfo.NoCriDmg; m_DamageInfo.bExtraDmg = extradmg; if (calcri) m_DamageInfo.Cal_Cri(m_ProjecTileData.shooter.m_AttackType, m_ProjecTileData.shooter.Get_StatInfo()); return m_DamageInfo; diff --git a/Assets/Script/Map/FieldBossData.cs b/Assets/Script/Map/FieldBossData.cs index 05bc3f3b5..0b264a950 100644 --- a/Assets/Script/Map/FieldBossData.cs +++ b/Assets/Script/Map/FieldBossData.cs @@ -24,6 +24,6 @@ public class FieldBossData : MyCoroutine private void AfterDie(int obj) { - Set_Coroutine(()=> { m_FieldBoss.On_Regen(); }, 10f); + Set_Coroutine(() => { m_FieldBoss.On_Regen(); }, 10f); } } \ No newline at end of file diff --git a/Assets/Script/Util/MyClass.cs b/Assets/Script/Util/MyClass.cs index aed4ba54c..ea25578d5 100644 --- a/Assets/Script/Util/MyClass.cs +++ b/Assets/Script/Util/MyClass.cs @@ -118,6 +118,7 @@ public class DamageInfo public Actor Beater; ObscuredDouble _BaseDmg, _Damage, _PiercingDmg; public double BaseDmg { get { return _BaseDmg; } set { _BaseDmg = value; _BaseDmg.RandomizeCryptoKey(); } } + public double NoCriDmg; public double Damage { get { return _Damage; } set { _Damage = value; _Damage.RandomizeCryptoKey(); } } public double PiercingDmg { get { return _PiercingDmg; } set { _PiercingDmg = value; _PiercingDmg.RandomizeCryptoKey(); } } public eCC CC; @@ -169,7 +170,7 @@ public class DamageInfo Critical = forceCri || DSUtil.RandomTrue((float)statinfo.Get_Stat(eStat.M_CRI) + addcri) ? eStat.M_CRI : eStat.None; if (Critical == eStat.M_CRI) { - Damage += Damage * statinfo.Get_Stat(eStat.M_CRI_DMG_Multiplier); + Damage += NoCriDmg * statinfo.Get_Stat(eStat.M_CRI_DMG_Multiplier); TextColor = DSUtil.Format("{0} ", Critical); } } @@ -183,7 +184,7 @@ public class DamageInfo var addcridmg = Get_AddValue(eAddExtraType.AddCriDmg_byTonado); var addcripiercingdmg = Get_AddValue(eAddExtraType.AddCRI_Piercing_Multiplier_byTonado); - Damage += Damage * (statinfo.Get_Stat(eStat.CRI_DMG_Multiplier) + addcridmg); + Damage += NoCriDmg * (statinfo.Get_Stat(eStat.CRI_DMG_Multiplier) + addcridmg); TextColor = DSUtil.Format("{0} ", Critical); PiercingDmg += BaseDmg * (statinfo.Get_Stat(eStat.CRI_Piercing_Multiplier) + addcripiercingdmg); }