diff --git a/Assets/ResWork/Suriyun/Monster Pack Ice/Animations/Brother Penguin/Anim_Brother_Penguin@skill2end.fbx b/Assets/ResWork/Suriyun/Monster Pack Ice/Animations/Brother Penguin/Anim_Brother_Penguin@skill2end.fbx new file mode 100644 index 000000000..7dfcf06ab Binary files /dev/null and b/Assets/ResWork/Suriyun/Monster Pack Ice/Animations/Brother Penguin/Anim_Brother_Penguin@skill2end.fbx differ diff --git a/Assets/ResWork/Suriyun/Monster Pack Ice/Animations/Brother Penguin/Anim_Brother_Penguin@skill2end.fbx.meta b/Assets/ResWork/Suriyun/Monster Pack Ice/Animations/Brother Penguin/Anim_Brother_Penguin@skill2end.fbx.meta new file mode 100644 index 000000000..4d1eeeb46 --- /dev/null +++ b/Assets/ResWork/Suriyun/Monster Pack Ice/Animations/Brother Penguin/Anim_Brother_Penguin@skill2end.fbx.meta @@ -0,0 +1,148 @@ +fileFormatVersion: 2 +guid: 12835b29a447190428cc265bd1c9b1d5 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: + - first: + 74: 7735016008245977959 + second: Attack + externalObjects: {} + materials: + materialImportMode: 2 + 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: Attack + takeName: Anim_Brother_Penguin@Attack + internalID: 0 + firstFrame: 81 + lastFrame: 95 + 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: + - time: 0.19821826 + functionName: Projectile + data: + objectReferenceParameter: {instanceID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 81 + 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: 1 + 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: 1 + importBlendShapeDeformPercent: 0 + remapMaterialsIfMaterialImportModeIsNone: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/Suriyun/Monster Pack Ice/Animations/Brother Penguin/Brother_Penguin_Boss.controller b/Assets/ResWork/Suriyun/Monster Pack Ice/Animations/Brother Penguin/Brother_Penguin_Boss.controller index 67af0e80b..984d05779 100644 --- a/Assets/ResWork/Suriyun/Monster Pack Ice/Animations/Brother Penguin/Brother_Penguin_Boss.controller +++ b/Assets/ResWork/Suriyun/Monster Pack Ice/Animations/Brother Penguin/Brother_Penguin_Boss.controller @@ -27,6 +27,34 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &-4094430375559255232 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: boss_skill2end + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 4032335584295174705} + 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: 7735016008245977959, guid: 12835b29a447190428cc265bd1c9b1d5, + type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &-2916805882626545900 AnimatorState: serializedVersion: 6 @@ -55,28 +83,6 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &-2831235524619601487 -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.3333342 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1101 &-2394900857822568002 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -321,6 +327,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -508676212917486138} m_Position: {x: 430, y: -20, z: 0} + - serializedVersion: 1 + m_State: {fileID: -4094430375559255232} + m_Position: {x: 120, y: 30, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -350,6 +359,28 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 0} +--- !u!1101 &4032335584295174705 +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.57142866 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &5024961352097609239 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -380,10 +411,9 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: boss_skill2 - m_Speed: 1 + m_Speed: 3 m_CycleOffset: 0 - m_Transitions: - - {fileID: -2831235524619601487} + m_Transitions: [] m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 diff --git a/Assets/ResWork/Table/Export/SkillTypeConfig.json b/Assets/ResWork/Table/Export/SkillTypeConfig.json index dd81f8136..d21c55b0c 100644 --- a/Assets/ResWork/Table/Export/SkillTypeConfig.json +++ b/Assets/ResWork/Table/Export/SkillTypeConfig.json @@ -1 +1 @@ -[{"e_SkillExtraType": "Frost", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "1_Frost", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_Frost", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14001", "exception": "sss"}, {"e_SkillExtraType": "Cure", "e_SkillExtraTiming": "Start", "s_SkillNoticeIconPath": "2_Cure", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_Cure", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14002", "exception": "sss"}, {"e_SkillExtraType": "Freezing", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "3_Freezing", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "0.25", "e_SkillEffect": "Effect_Freezing", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14003", "exception": "sss"}, {"e_SkillExtraType": "Blood", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "4_Blood", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_Blood", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14004", "exception": "sss"}, {"e_SkillExtraType": "Poison", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "5_Poison", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_Poison", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14005", "exception": "sss"}, {"e_SkillExtraType": "Burn", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "6_Burn", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_Burn", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14006", "exception": "sss"}, {"e_SkillExtraType": "Stun", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "7_Stun", "e_EffectLocation": "Top", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_Stun", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14007", "exception": ""}, {"e_SkillExtraType": "Slow", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "8_Slow", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_Slow", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14008", "exception": ""}, {"e_SkillExtraType": "StatUp", "e_SkillExtraTiming": "Start", "s_SkillNoticeIconPath": "9_StatUp", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_StatUp", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14009", "exception": ""}, {"e_SkillExtraType": "ManaShield", "e_SkillExtraTiming": "Start", "s_SkillNoticeIconPath": "10_ManaShield", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_ManaShield", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14010", "exception": ""}, {"e_SkillExtraType": "SwordShield", "e_SkillExtraTiming": "Start", "s_SkillNoticeIconPath": "11_SwordShield", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_SwordShield", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14011", "exception": ""}, {"e_SkillExtraType": "SpeedUp", "e_SkillExtraTiming": "Start", "s_SkillNoticeIconPath": "12_SpeedUp", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_SpeedUp", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14012", "exception": ""}, {"e_SkillExtraType": "DefenceDecrease", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "13_DefenceDecrease", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_DefenceDecrease", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14013", "exception": ""}, {"e_SkillExtraType": "Aggro", "e_SkillExtraTiming": "Skill", "s_SkillNoticeIconPath": "14_Aggro", "e_EffectLocation": "Top", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_Aggro", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14014", "exception": "스킬에서 처리"}, {"e_SkillExtraType": "VampirHeal", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "15_VampirHeal", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_VampirHeal", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14015", "exception": ""}, {"e_SkillExtraType": "Knockback", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "16_Knockback", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "None", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14016", "exception": ""}, {"e_SkillExtraType": "Airborne", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "17_Airborne", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "None", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14017", "exception": ""}, {"e_SkillExtraType": "Curse", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "18_Curse", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_Curse", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14018", "exception": ""}, {"e_SkillExtraType": "ManaBurn", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "19_ManaBurn", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_ManaBurn", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14019", "exception": ""}, {"e_SkillExtraType": "HPBurn", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "20_HPBurn", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_HPBurn", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14020", "exception": ""}, {"e_SkillExtraType": "SilenceCurse", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "21_SilenceCurse", "e_EffectLocation": "Top", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_SilenceCurse", "s_SkillEffectWhenOff": "Effect_SilenceCurseOff", "n_EffectInfoDesc": "14021", "exception": ""}, {"e_SkillExtraType": "Barrier", "e_SkillExtraTiming": "GetHit", "s_SkillNoticeIconPath": "22_Barrier", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "0.6", "e_SkillEffect": "Effect_Barrier", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14022", "exception": ""}, {"e_SkillExtraType": "Reincarnation", "e_SkillExtraTiming": "AfterDie", "s_SkillNoticeIconPath": "23_Reincarnation", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_Reincarnation", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14023", "exception": ""}, {"e_SkillExtraType": "Blind", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "24_Blind", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_Blind", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14024", "exception": ""}, {"e_SkillExtraType": "PerHPBuff_SPD", "e_SkillExtraTiming": "GetHit", "s_SkillNoticeIconPath": "25_PerHPBuff_SPD", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_PerHPBuff_SPD", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14025", "exception": ""}, {"e_SkillExtraType": "PerHPBuff_ADEF", "e_SkillExtraTiming": "GetHit", "s_SkillNoticeIconPath": "26_PerHPBuff_ADEF", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_PerHPBuff_ADEF", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14026", "exception": ""}, {"e_SkillExtraType": "PerHPBuff_AMDEF", "e_SkillExtraTiming": "GetHit", "s_SkillNoticeIconPath": "27_PerHPBuff_AMDEF", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_PerHPBuff_AMDEF", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14027", "exception": ""}, {"e_SkillExtraType": "PerHPBuff_AASPD", "e_SkillExtraTiming": "GetHit", "s_SkillNoticeIconPath": "28_PerHPBuff_SPD", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_PerHPBuff_AASPD", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14028", "exception": ""}, {"e_SkillExtraType": "KnockBack_byHitter", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "29_KnockBack_byHitter", "e_EffectLocation": "Top", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "None", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14029", "exception": ""}, {"e_SkillExtraType": "Revive30", "e_SkillExtraTiming": "GetHit", "s_SkillNoticeIconPath": "30_Revive30", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_Revive30Shield", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14030", "exception": ""}, {"e_SkillExtraType": "PerHPBuff_AMSPD", "e_SkillExtraTiming": "GetHit", "s_SkillNoticeIconPath": "31_PerHPBuff_AMSPD", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_PerHPBuff_AMSPD", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14031", "exception": ""}] \ No newline at end of file +[{"e_SkillExtraType": "Frost", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "1_Frost", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_Frost", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14001", "exception": "sss"}, {"e_SkillExtraType": "Cure", "e_SkillExtraTiming": "Start", "s_SkillNoticeIconPath": "2_Cure", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_Cure", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14002", "exception": "sss"}, {"e_SkillExtraType": "Freezing", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "3_Freezing", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "0.25", "e_SkillEffect": "Effect_Freezing", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14003", "exception": "sss"}, {"e_SkillExtraType": "Blood", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "4_Blood", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_Blood", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14004", "exception": "sss"}, {"e_SkillExtraType": "Poison", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "5_Poison", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_Poison", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14005", "exception": "sss"}, {"e_SkillExtraType": "Burn", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "6_Burn", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_Burn", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14006", "exception": "sss"}, {"e_SkillExtraType": "Stun", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "7_Stun", "e_EffectLocation": "Top", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_Stun", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14007", "exception": ""}, {"e_SkillExtraType": "Slow", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "8_Slow", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_Slow", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14008", "exception": ""}, {"e_SkillExtraType": "StatUp", "e_SkillExtraTiming": "Start", "s_SkillNoticeIconPath": "9_StatUp", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_StatUp", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14009", "exception": ""}, {"e_SkillExtraType": "ManaShield", "e_SkillExtraTiming": "Start", "s_SkillNoticeIconPath": "10_ManaShield", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_ManaShield", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14010", "exception": ""}, {"e_SkillExtraType": "SwordShield", "e_SkillExtraTiming": "Start", "s_SkillNoticeIconPath": "11_SwordShield", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_SwordShield", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14011", "exception": ""}, {"e_SkillExtraType": "SpeedUp", "e_SkillExtraTiming": "Start", "s_SkillNoticeIconPath": "12_SpeedUp", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_SpeedUp", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14012", "exception": ""}, {"e_SkillExtraType": "DefenceDecrease", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "13_DefenceDecrease", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_DefenceDecrease", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14013", "exception": ""}, {"e_SkillExtraType": "Aggro", "e_SkillExtraTiming": "Skill", "s_SkillNoticeIconPath": "14_Aggro", "e_EffectLocation": "Top", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_Aggro", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14014", "exception": "스킬에서 처리"}, {"e_SkillExtraType": "VampirHeal", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "15_VampirHeal", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_VampirHeal", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14015", "exception": ""}, {"e_SkillExtraType": "Knockback", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "16_Knockback", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "None", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14016", "exception": ""}, {"e_SkillExtraType": "Airborne", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "17_Airborne", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "None", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14017", "exception": ""}, {"e_SkillExtraType": "Curse", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "18_Curse", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_Curse", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14018", "exception": ""}, {"e_SkillExtraType": "ManaBurn", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "19_ManaBurn", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_ManaBurn", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14019", "exception": ""}, {"e_SkillExtraType": "HPBurn", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "20_HPBurn", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_HPBurn", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14020", "exception": ""}, {"e_SkillExtraType": "SilenceCurse", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "21_SilenceCurse", "e_EffectLocation": "Top", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_SilenceCurse", "s_SkillEffectWhenOff": "Effect_SilenceCurseOff", "n_EffectInfoDesc": "14021", "exception": ""}, {"e_SkillExtraType": "Barrier", "e_SkillExtraTiming": "GetHit", "s_SkillNoticeIconPath": "22_Barrier", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "0.6", "e_SkillEffect": "Effect_Barrier", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14022", "exception": ""}, {"e_SkillExtraType": "Barrier_Boss", "e_SkillExtraTiming": "GetHit", "s_SkillNoticeIconPath": "22_Barrier", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1.2", "e_SkillEffect": "Effect_Barrier", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14022", "exception": ""}, {"e_SkillExtraType": "Reincarnation", "e_SkillExtraTiming": "AfterDie", "s_SkillNoticeIconPath": "23_Reincarnation", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_Reincarnation", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14023", "exception": ""}, {"e_SkillExtraType": "Blind", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "24_Blind", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_Blind", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14024", "exception": ""}, {"e_SkillExtraType": "PerHPBuff_SPD", "e_SkillExtraTiming": "GetHit", "s_SkillNoticeIconPath": "25_PerHPBuff_SPD", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_PerHPBuff_SPD", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14025", "exception": ""}, {"e_SkillExtraType": "PerHPBuff_ADEF", "e_SkillExtraTiming": "GetHit", "s_SkillNoticeIconPath": "26_PerHPBuff_ADEF", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_PerHPBuff_ADEF", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14026", "exception": ""}, {"e_SkillExtraType": "PerHPBuff_AMDEF", "e_SkillExtraTiming": "GetHit", "s_SkillNoticeIconPath": "27_PerHPBuff_AMDEF", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_PerHPBuff_AMDEF", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14027", "exception": ""}, {"e_SkillExtraType": "PerHPBuff_AASPD", "e_SkillExtraTiming": "GetHit", "s_SkillNoticeIconPath": "28_PerHPBuff_SPD", "e_EffectLocation": "Mid", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_PerHPBuff_AASPD", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14028", "exception": ""}, {"e_SkillExtraType": "KnockBack_byHitter", "e_SkillExtraTiming": "Hit", "s_SkillNoticeIconPath": "29_KnockBack_byHitter", "e_EffectLocation": "Top", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "None", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14029", "exception": ""}, {"e_SkillExtraType": "Revive30", "e_SkillExtraTiming": "GetHit", "s_SkillNoticeIconPath": "30_Revive30", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_Revive30Shield", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14030", "exception": ""}, {"e_SkillExtraType": "PerHPBuff_AMSPD", "e_SkillExtraTiming": "GetHit", "s_SkillNoticeIconPath": "31_PerHPBuff_AMSPD", "e_EffectLocation": "Bottom", "n_EffectPosition_X": "0", "n_EffectPosition_Y": "0", "f_EffectScale": "1", "e_SkillEffect": "Effect_PerHPBuff_AMSPD", "s_SkillEffectWhenOff": "", "n_EffectInfoDesc": "14031", "exception": ""}] \ No newline at end of file diff --git a/Assets/ResWork/Table/butler.xlsm b/Assets/ResWork/Table/butler.xlsm index b0fa25037..40204cee8 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_BrotherPenguin_Skill2Charging.prefab b/Assets/Res_Addr/Effect/Effect_BrotherPenguin_Skill2Charging.prefab new file mode 100644 index 000000000..8ffdf5456 --- /dev/null +++ b/Assets/Res_Addr/Effect/Effect_BrotherPenguin_Skill2Charging.prefab @@ -0,0 +1,139 @@ +%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_BrotherPenguin_Skill2Charging + 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: 8223945124794007536} + 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 &5711356697042197048 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4504870314295858} + m_Modifications: + - target: {fileID: 4423522346633618888, guid: 65dd71f66cb08824eac799ed416af524, + type: 3} + propertyPath: m_LocalScale.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4423522346633618888, guid: 65dd71f66cb08824eac799ed416af524, + type: 3} + propertyPath: m_LocalScale.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4423522346633618888, guid: 65dd71f66cb08824eac799ed416af524, + type: 3} + propertyPath: m_LocalScale.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4423522346633618888, guid: 65dd71f66cb08824eac799ed416af524, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4423522346633618888, guid: 65dd71f66cb08824eac799ed416af524, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4423522346633618888, guid: 65dd71f66cb08824eac799ed416af524, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4423522346633618888, guid: 65dd71f66cb08824eac799ed416af524, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4423522346633618888, guid: 65dd71f66cb08824eac799ed416af524, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4423522346633618888, guid: 65dd71f66cb08824eac799ed416af524, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4423522346633618888, guid: 65dd71f66cb08824eac799ed416af524, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4423522346633618888, guid: 65dd71f66cb08824eac799ed416af524, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4423522346633618888, guid: 65dd71f66cb08824eac799ed416af524, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4423522346633618888, guid: 65dd71f66cb08824eac799ed416af524, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4423522346633618935, guid: 65dd71f66cb08824eac799ed416af524, + type: 3} + propertyPath: m_Name + value: HCFX_Orb_05 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 65dd71f66cb08824eac799ed416af524, type: 3} +--- !u!4 &8223945124794007536 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4423522346633618888, guid: 65dd71f66cb08824eac799ed416af524, + type: 3} + m_PrefabInstance: {fileID: 5711356697042197048} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Res_Addr/Effect/Effect_BrotherPenguin_Skill2Charging.prefab.meta b/Assets/Res_Addr/Effect/Effect_BrotherPenguin_Skill2Charging.prefab.meta new file mode 100644 index 000000000..f338f07c0 --- /dev/null +++ b/Assets/Res_Addr/Effect/Effect_BrotherPenguin_Skill2Charging.prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: b959d68488cd4194ba089b2054ce3ba7 +timeCreated: 1587080156 +licenseType: Store +NativeFormatImporter: + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Res_Addr/Effect/Effect_BrotherPenguin_Skill2ChargingEnd.prefab b/Assets/Res_Addr/Effect/Effect_BrotherPenguin_Skill2ChargingEnd.prefab new file mode 100644 index 000000000..337f9710c --- /dev/null +++ b/Assets/Res_Addr/Effect/Effect_BrotherPenguin_Skill2ChargingEnd.prefab @@ -0,0 +1,139 @@ +%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_BrotherPenguin_Skill2ChargingEnd + 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: 1894644907640183157} + 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 &2678562988110318568 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4504870314295858} + m_Modifications: + - target: {fileID: 4568632827120603805, guid: af75fb0ff141ccf4bb2ab85c4a605c90, + type: 3} + propertyPath: m_LocalScale.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4568632827120603805, guid: af75fb0ff141ccf4bb2ab85c4a605c90, + type: 3} + propertyPath: m_LocalScale.y + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4568632827120603805, guid: af75fb0ff141ccf4bb2ab85c4a605c90, + type: 3} + propertyPath: m_LocalScale.z + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4568632827120603805, guid: af75fb0ff141ccf4bb2ab85c4a605c90, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4568632827120603805, guid: af75fb0ff141ccf4bb2ab85c4a605c90, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4568632827120603805, guid: af75fb0ff141ccf4bb2ab85c4a605c90, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4568632827120603805, guid: af75fb0ff141ccf4bb2ab85c4a605c90, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4568632827120603805, guid: af75fb0ff141ccf4bb2ab85c4a605c90, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4568632827120603805, guid: af75fb0ff141ccf4bb2ab85c4a605c90, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4568632827120603805, guid: af75fb0ff141ccf4bb2ab85c4a605c90, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4568632827120603805, guid: af75fb0ff141ccf4bb2ab85c4a605c90, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4568632827120603805, guid: af75fb0ff141ccf4bb2ab85c4a605c90, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4568632827120603805, guid: af75fb0ff141ccf4bb2ab85c4a605c90, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4568632827120603810, guid: af75fb0ff141ccf4bb2ab85c4a605c90, + type: 3} + propertyPath: m_Name + value: HCFX_Orb_05_Get + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: af75fb0ff141ccf4bb2ab85c4a605c90, type: 3} +--- !u!4 &1894644907640183157 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4568632827120603805, guid: af75fb0ff141ccf4bb2ab85c4a605c90, + type: 3} + m_PrefabInstance: {fileID: 2678562988110318568} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Res_Addr/Effect/Effect_BrotherPenguin_Skill2ChargingEnd.prefab.meta b/Assets/Res_Addr/Effect/Effect_BrotherPenguin_Skill2ChargingEnd.prefab.meta new file mode 100644 index 000000000..539e25a19 --- /dev/null +++ b/Assets/Res_Addr/Effect/Effect_BrotherPenguin_Skill2ChargingEnd.prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 8fe2b7ac5644dcc428937110981fdd26 +timeCreated: 1587080156 +licenseType: Store +NativeFormatImporter: + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/Character/Mob/Boss/Boss_BrotherPenguin.cs b/Assets/Script/Character/Mob/Boss/Boss_BrotherPenguin.cs index 3d6475fae..3ef622194 100644 --- a/Assets/Script/Character/Mob/Boss/Boss_BrotherPenguin.cs +++ b/Assets/Script/Character/Mob/Boss/Boss_BrotherPenguin.cs @@ -29,9 +29,11 @@ public class Boss_BrotherPenguin : BossMobActor public float Skill2LifeTime = 12f; [Header("스킬2 보호막 생명력 비율")] public float Skill2BarrierRate = 0.25f; + [Header("스킬2 차징시간")] + public float Skill2ChargingTime = 3f; SkillListTableData m_Frost = new SkillListTableData { e_SkillExtraType = eSkillExtraType.Frost, f_ExtraValue4 = 1f }; - SkillListTableData m_Barrier = new SkillListTableData { e_SkillExtraType = eSkillExtraType.Barrier }; + SkillListTableData m_Barrier = new SkillListTableData { e_SkillExtraType = eSkillExtraType.Barrier_Boss }; public override void Set(MonsterTableData mobtable, Vector3 pos, Action actDie, int order, float noDmgTime = 0f) { @@ -43,14 +45,14 @@ public class Boss_BrotherPenguin : BossMobActor m_Frost.f_ExtraValue2 = Skill1AtkSpd; m_Frost.f_ExtraValue3 = Skill1MovSpd; - m_Barrier.e_SkillExtraType = eSkillExtraType.Barrier; + m_Barrier.e_SkillExtraType = eSkillExtraType.Barrier_Boss; m_Barrier.f_ExtraValue2 = Skill2BarrierRate; CoolTime_Skill1 = 1f; CoolTime_Skill2 = 2f; - //CoolTime_Skill1 = 10000f; - CoolTime_Skill2 = 20000f; + CoolTime_Skill1 = 10000f; + //CoolTime_Skill2 = 20000f; } protected override void Init(bool initSkill1CoolTime, bool initSkill2CoolTime) @@ -112,14 +114,22 @@ public class Boss_BrotherPenguin : BossMobActor { Change_MobStatus(eMobStatus.Skill); AnimationPlay("boss_skill2"); - - yield return new WaitForSeconds(0.25f); - Show_Barrier(m_Barrier, table_skilltypeconfig.Ins.Get_Data_orNull(m_Barrier.e_SkillExtraType), Skill2LifeTime); + float adddelaytime = 0.25f; + InGameInfo.Ins.Show_Effect("Effect_BrotherPenguin_Skill2Charging", this, eEffectLocation.Mid, Skill2ChargingTime + adddelaytime); + yield return new WaitForSeconds(Skill2ChargingTime); + AnimationPlay("boss_skill2end"); yield return new WaitForSeconds(0.25f); + InGameInfo.Ins.Show_Effect("Effect_BrotherPenguin_Skill2ChargingEnd", this, eEffectLocation.Mid, 1f); + + yield return new WaitForSeconds(adddelaytime); + Show_Barrier(m_Barrier, Skill2LifeTime); + + float battletime = 0.25f; + yield return new WaitForSeconds(battletime); Check_Battle(); - yield return new WaitForSeconds(Skill2LifeTime); + yield return new WaitForSeconds(Skill2LifeTime - battletime); Init(false, true); } } \ No newline at end of file diff --git a/Assets/Script/Character/Mob/MobActor.cs b/Assets/Script/Character/Mob/MobActor.cs index f9196bc11..80144d5c9 100644 --- a/Assets/Script/Character/Mob/MobActor.cs +++ b/Assets/Script/Character/Mob/MobActor.cs @@ -692,7 +692,7 @@ public class MobActor : Actor { var conditionHP = Get_MaxHP() * temp.f_ExtraValue1; if (conditionHP >= Get_HP()) - Show_Barrier(temp, skilltype, 10000); + Show_Barrier(temp, 10000); } break; case eSkillExtraType.Reincarnation: // 부활 체크 @@ -750,16 +750,17 @@ public class MobActor : Actor } } - ProjectileData pd_Barrier = new ProjectileData { e_SkillExtraType = eSkillExtraType.Barrier }; - protected void Show_Barrier(SkillListTableData skilldata, SkillTypeConfigTableData skilltype, float lifeTime) + ProjectileData pd_Barrier = new ProjectileData(); + protected void Show_Barrier(SkillListTableData skilldata, float lifeTime) { - pd_Barrier.m_skillTypeConfigTable = skilltype; + pd_Barrier.e_SkillExtraType = skilldata.e_SkillExtraType; + pd_Barrier.m_skillTypeConfigTable = table_skilltypeconfig.Ins.Get_Data_orNull(skilldata.e_SkillExtraType); dic_skill[skilldata] = 0; - dic_skillextra[skilltype.e_SkillExtraType] = true; + dic_skillextra[skilldata.e_SkillExtraType] = true; InGameInfo.Ins.Show_SkillTypeEffect(pd_Barrier, this, lifeTime, effect => { - effect.Set_EffectwhenOff(skilltype.s_SkillEffectWhenOff); + effect.Set_EffectwhenOff(pd_Barrier.m_skillTypeConfigTable.s_SkillEffectWhenOff); if (!dic_CCEffect.ContainsKey(eCC.Barrier)) dic_CCEffect.Add(eCC.Barrier, null); dic_CCEffect[eCC.Barrier] = effect; diff --git a/Assets/Script/Table/Skill/table_skilllist.cs b/Assets/Script/Table/Skill/table_skilllist.cs index 4fe8e0886..aacf5247a 100644 --- a/Assets/Script/Table/Skill/table_skilllist.cs +++ b/Assets/Script/Table/Skill/table_skilllist.cs @@ -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, Barrier, Reincarnation, Blind, PerHPBuff_SPD, PerHPBuff_ADEF, PerHPBuff_AMDEF, + SilenceCurse, Barrier, Barrier_Boss, Reincarnation, Blind, PerHPBuff_SPD, PerHPBuff_ADEF, PerHPBuff_AMDEF, PerHPBuff_AASPD, PerHPBuff_AMSPD, PerHPBuff_Projectile, KnockBack_byHitter, Revive30 } public class SkillListTableData : TableDataBase