diff --git a/Assets/ResWork/Suriyun/Monster Pack Forest 2/Animations/Shaga/Anim_Shaga@skill1.fbx b/Assets/ResWork/Suriyun/Monster Pack Forest 2/Animations/Shaga/Anim_Shaga@skill1.fbx new file mode 100644 index 000000000..95722f7e6 Binary files /dev/null and b/Assets/ResWork/Suriyun/Monster Pack Forest 2/Animations/Shaga/Anim_Shaga@skill1.fbx differ diff --git a/Assets/ResWork/Suriyun/Monster Pack Forest 2/Animations/Shaga/Anim_Shaga@skill1.fbx.meta b/Assets/ResWork/Suriyun/Monster Pack Forest 2/Animations/Shaga/Anim_Shaga@skill1.fbx.meta new file mode 100644 index 000000000..0f48f407d --- /dev/null +++ b/Assets/ResWork/Suriyun/Monster Pack Forest 2/Animations/Shaga/Anim_Shaga@skill1.fbx.meta @@ -0,0 +1,148 @@ +fileFormatVersion: 2 +guid: 1778bc76d7fe45746bbdf36c042782ec +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: + - first: + 74: 3250117892721839549 + second: boss_skill1 + 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_skill1 + takeName: Anim_Shaga@Damage + internalID: 0 + firstFrame: 91 + lastFrame: 105 + 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.16829275 + functionName: BossProjectile2 + data: + objectReferenceParameter: {instanceID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 91 + 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: diff --git a/Assets/ResWork/Suriyun/Monster Pack Forest 2/Animations/Shaga/Forest_Shaga_Boss.controller b/Assets/ResWork/Suriyun/Monster Pack Forest 2/Animations/Shaga/Forest_Shaga_Boss.controller index 398d55f65..c30b017e6 100644 --- a/Assets/ResWork/Suriyun/Monster Pack Forest 2/Animations/Shaga/Forest_Shaga_Boss.controller +++ b/Assets/ResWork/Suriyun/Monster Pack Forest 2/Animations/Shaga/Forest_Shaga_Boss.controller @@ -183,6 +183,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 110293690} m_Position: {x: 430, y: -110, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1214431828715795864} + m_Position: {x: 120, y: -140, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -212,6 +215,34 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 0} +--- !u!1102 &1214431828715795864 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: boss_skill1 + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 8652537664410932935} + 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: 3250117892721839549, guid: 1778bc76d7fe45746bbdf36c042782ec, + type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1101 &4778026026078689383 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -234,3 +265,25 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &8652537664410932935 +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.57142854 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Assets/Res_Addr/Obj/BossShaga_Skill1_Indicator.prefab b/Assets/Res_Addr/Obj/BossShaga_Skill1_Indicator.prefab new file mode 100644 index 000000000..6cb469dea --- /dev/null +++ b/Assets/Res_Addr/Obj/BossShaga_Skill1_Indicator.prefab @@ -0,0 +1,117 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &821061129531636761 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2201136656505196193} + m_Layer: 3 + m_Name: BossShaga_Skill1_Indicator + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2201136656505196193 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 821061129531636761} + 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: 6375824511339138443} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5389208046211158943 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6375824511339138443} + - component: {fileID: 292154521008100957} + - component: {fileID: 3775451288762826441} + m_Layer: 3 + m_Name: Indicator + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6375824511339138443 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5389208046211158943} + serializedVersion: 2 + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 3, y: 3, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2201136656505196193} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &292154521008100957 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5389208046211158943} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &3775451288762826441 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5389208046211158943} + 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: 3e1c80888ebc582469572ddac13cc967, 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} diff --git a/Assets/Res_Addr/Obj/BossShaga_Skill1_Indicator.prefab.meta b/Assets/Res_Addr/Obj/BossShaga_Skill1_Indicator.prefab.meta new file mode 100644 index 000000000..51d9881c2 --- /dev/null +++ b/Assets/Res_Addr/Obj/BossShaga_Skill1_Indicator.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 76b1ebc9ff6dff54dbec7733902c4ddc +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Res_Addr/Projectile/FieldBoss/Shaga_Skill1.prefab b/Assets/Res_Addr/Projectile/FieldBoss/Shaga_Skill1.prefab new file mode 100644 index 000000000..87085f539 --- /dev/null +++ b/Assets/Res_Addr/Projectile/FieldBoss/Shaga_Skill1.prefab @@ -0,0 +1,183 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2275002850514248236 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7700533061093772912} + - component: {fileID: 4499590779896156765} + m_Layer: 0 + m_Name: Shaga_Skill1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7700533061093772912 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2275002850514248236} + 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: 5624418575117585452} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4499590779896156765 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2275002850514248236} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67e3b0730f76b974489bd85bc21215fc, type: 3} + m_Name: + m_EditorClassIdentifier: + ColliderLayer: Actor + m_Pierce: 0 + str_HitEffect: + m_ShowTimeOverEffect: 0 +--- !u!1001 &7207344116226726912 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7700533061093772912} + m_Modifications: + - target: {fileID: 803107738701126885, guid: 082db2f7e42f95144babf5127866a2c1, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 803107738701126886, guid: 082db2f7e42f95144babf5127866a2c1, + type: 3} + propertyPath: InitialModule.startColor.maxColor.g + value: 0.07738829 + objectReference: {fileID: 0} + - target: {fileID: 803107738701126886, guid: 082db2f7e42f95144babf5127866a2c1, + type: 3} + propertyPath: InitialModule.startColor.maxColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 803107739312277615, guid: 082db2f7e42f95144babf5127866a2c1, + type: 3} + propertyPath: InitialModule.startColor.maxColor.b + value: 0.3803922 + objectReference: {fileID: 0} + - target: {fileID: 803107739312277615, guid: 082db2f7e42f95144babf5127866a2c1, + type: 3} + propertyPath: InitialModule.startColor.maxColor.g + value: 0.44212335 + objectReference: {fileID: 0} + - target: {fileID: 803107739312277615, guid: 082db2f7e42f95144babf5127866a2c1, + type: 3} + propertyPath: InitialModule.startColor.maxColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 803107739312277650, guid: 082db2f7e42f95144babf5127866a2c1, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2819455038016823047, guid: 082db2f7e42f95144babf5127866a2c1, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3028762750161260588, guid: 082db2f7e42f95144babf5127866a2c1, + type: 3} + propertyPath: m_LocalScale.x + value: 0.29999998 + objectReference: {fileID: 0} + - target: {fileID: 3028762750161260588, guid: 082db2f7e42f95144babf5127866a2c1, + type: 3} + propertyPath: m_LocalScale.y + value: 0.29999998 + objectReference: {fileID: 0} + - target: {fileID: 3028762750161260588, guid: 082db2f7e42f95144babf5127866a2c1, + type: 3} + propertyPath: m_LocalScale.z + value: 0.29999998 + objectReference: {fileID: 0} + - target: {fileID: 3028762750161260588, guid: 082db2f7e42f95144babf5127866a2c1, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3028762750161260588, guid: 082db2f7e42f95144babf5127866a2c1, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3028762750161260588, guid: 082db2f7e42f95144babf5127866a2c1, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3028762750161260588, guid: 082db2f7e42f95144babf5127866a2c1, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3028762750161260588, guid: 082db2f7e42f95144babf5127866a2c1, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3028762750161260588, guid: 082db2f7e42f95144babf5127866a2c1, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3028762750161260588, guid: 082db2f7e42f95144babf5127866a2c1, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3028762750161260588, guid: 082db2f7e42f95144babf5127866a2c1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3028762750161260588, guid: 082db2f7e42f95144babf5127866a2c1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3028762750161260588, guid: 082db2f7e42f95144babf5127866a2c1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3028762750161260589, guid: 082db2f7e42f95144babf5127866a2c1, + type: 3} + propertyPath: m_Name + value: FX_Shoot_Poison_projectile + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 3028762750161260590, guid: 082db2f7e42f95144babf5127866a2c1, type: 3} + - {fileID: 3028762750161260591, guid: 082db2f7e42f95144babf5127866a2c1, type: 3} + m_RemovedGameObjects: + - {fileID: 2819455038016823047, guid: 082db2f7e42f95144babf5127866a2c1, type: 3} + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 082db2f7e42f95144babf5127866a2c1, type: 3} +--- !u!4 &5624418575117585452 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3028762750161260588, guid: 082db2f7e42f95144babf5127866a2c1, + type: 3} + m_PrefabInstance: {fileID: 7207344116226726912} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Res_Addr/Projectile/FieldBoss/Shaga_Skill1.prefab.meta b/Assets/Res_Addr/Projectile/FieldBoss/Shaga_Skill1.prefab.meta new file mode 100644 index 000000000..75a06edd6 --- /dev/null +++ b/Assets/Res_Addr/Projectile/FieldBoss/Shaga_Skill1.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 87452dd1af6fcda4e92683d83951a24c +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Res_Addr/Projectile/FieldBoss/Shaga_Skill1Ground.prefab b/Assets/Res_Addr/Projectile/FieldBoss/Shaga_Skill1Ground.prefab new file mode 100644 index 000000000..3c554dc35 --- /dev/null +++ b/Assets/Res_Addr/Projectile/FieldBoss/Shaga_Skill1Ground.prefab @@ -0,0 +1,162 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2316993098813960081 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5049026989288917698} + - component: {fileID: -4152456888977005349} + - component: {fileID: 7742248077501836424} + m_Layer: 0 + m_Name: Shaga_Skill1Ground + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5049026989288917698 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2316993098813960081} + 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: 1741106019830378695} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &-4152456888977005349 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2316993098813960081} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e5d2fd9d460da6a4d87b4be83a4cdc32, type: 3} + m_Name: + m_EditorClassIdentifier: + ColliderLayer: Actor + m_Pierce: 1 + str_HitEffect: + m_ShowTimeOverEffect: 1 +--- !u!65 &7742248077501836424 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2316993098813960081} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 3, y: 3, z: 3} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1001 &910241315895238427 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5049026989288917698} + m_Modifications: + - target: {fileID: 1479561207183142876, guid: 90ab78afc862c6a4b8c334c9deff7efb, + type: 3} + propertyPath: m_LocalScale.x + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 1479561207183142876, guid: 90ab78afc862c6a4b8c334c9deff7efb, + type: 3} + propertyPath: m_LocalScale.y + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 1479561207183142876, guid: 90ab78afc862c6a4b8c334c9deff7efb, + type: 3} + propertyPath: m_LocalScale.z + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 1479561207183142876, guid: 90ab78afc862c6a4b8c334c9deff7efb, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1479561207183142876, guid: 90ab78afc862c6a4b8c334c9deff7efb, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1479561207183142876, guid: 90ab78afc862c6a4b8c334c9deff7efb, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1479561207183142876, guid: 90ab78afc862c6a4b8c334c9deff7efb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1479561207183142876, guid: 90ab78afc862c6a4b8c334c9deff7efb, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1479561207183142876, guid: 90ab78afc862c6a4b8c334c9deff7efb, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1479561207183142876, guid: 90ab78afc862c6a4b8c334c9deff7efb, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1479561207183142876, guid: 90ab78afc862c6a4b8c334c9deff7efb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1479561207183142876, guid: 90ab78afc862c6a4b8c334c9deff7efb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1479561207183142876, guid: 90ab78afc862c6a4b8c334c9deff7efb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9179823187432668385, guid: 90ab78afc862c6a4b8c334c9deff7efb, + type: 3} + propertyPath: m_Name + value: FX_Flameflow_floor + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 90ab78afc862c6a4b8c334c9deff7efb, type: 3} +--- !u!4 &1741106019830378695 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1479561207183142876, guid: 90ab78afc862c6a4b8c334c9deff7efb, + type: 3} + m_PrefabInstance: {fileID: 910241315895238427} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Res_Addr/Projectile/FieldBoss/Shaga_Skill1Ground.prefab.meta b/Assets/Res_Addr/Projectile/FieldBoss/Shaga_Skill1Ground.prefab.meta new file mode 100644 index 000000000..8abbd4729 --- /dev/null +++ b/Assets/Res_Addr/Projectile/FieldBoss/Shaga_Skill1Ground.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 19ab213e78c557b4e953094760ac5035 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/Character/Mob/Boss/Boss_Shaga.cs b/Assets/Script/Character/Mob/Boss/Boss_Shaga.cs index 578ba09ad..94aa2ca41 100644 --- a/Assets/Script/Character/Mob/Boss/Boss_Shaga.cs +++ b/Assets/Script/Character/Mob/Boss/Boss_Shaga.cs @@ -8,6 +8,8 @@ public class Boss_Shaga : BossMobActor public float Skill1CoolTime = 18f; [Header("스킬1 데미지")] public float Skill1Dmg = 1.6f; + [Header("스킬1 디버프 시간")] + public float Skill1FrostTime = 6f; [Header("스킬1 공속 감소")] public float Skill1AtkSpd = 0.5f; [Header("스킬1 이속 감소")] @@ -22,20 +24,16 @@ public class Boss_Shaga : BossMobActor public float Skill2StatRate = 0.5f; 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 actDie, int order) { base.Set(mobtable, pos, actDie, order); - //Load_Indicator("BrotherPenguin_Skill1_Indicator", 0); + Load_Indicator("BossShaga_Skill1_Indicator", 0); - //m_Frost.f_ExtraValue1 = Skill1FrostTime; - //m_Frost.f_ExtraValue2 = Skill1AtkSpd; - //m_Frost.f_ExtraValue3 = Skill1MovSpd; - - //m_Barrier.e_SkillExtraType = eSkillExtraType.Barrier; - //m_Barrier.f_ExtraValue2 = Skill2BarrierRate; + m_Frost.f_ExtraValue1 = Skill1FrostTime; + m_Frost.f_ExtraValue2 = Skill1AtkSpd; + m_Frost.f_ExtraValue3 = Skill1MovSpd; CoolTime_Skill1 = 1f; CoolTime_Skill2 = 2f; @@ -53,8 +51,8 @@ public class Boss_Shaga : BossMobActor base.Update(); if (IsDead() || IsStop) return; - //if (UseSkillIndex == 1 && MobStatus != eMobStatus.Skill) - // StartCoroutine(Co_Skill1()); + if (UseSkillIndex == 1 && MobStatus != eMobStatus.Skill) + StartCoroutine(Co_Skill1()); //else if (UseSkillIndex == 2 && MobStatus != eMobStatus.Skill) // StartCoroutine(Co_Skill2()); } @@ -64,14 +62,11 @@ public class Boss_Shaga : BossMobActor Change_MobStatus(eMobStatus.Skill); AnimationPlay("boss_skill1"); dic_indicator[0].SetActive(true); - dic_indicator[0].transform.position = Get_position(); + dic_indicator[0].transform.position = DSUtil.Get_RandomPos_onNavMesh(Get_position(), 2f, 3f); - //yield return new WaitForSeconds(Skill1ChargingTime); - - AnimationPlay("boss_skill1attack"); - dic_indicator[0].SetActive(false); yield return new WaitForSeconds(0.5f); + dic_indicator[0].SetActive(false); Check_Battle(); Init(true, false); } @@ -79,10 +74,23 @@ public class Boss_Shaga : BossMobActor protected override Vector3 Get_Skill1Pos() { return dic_indicator[0].transform.position; } protected override void Set_Skill1Projectile(ProjectileBase pb) { - 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; + var pc = pb as Projectile_Curved; + pc.Launch_Curved(Get_position(), Get_Skill1Pos(), 1.5f, 4f, true, () => + { + ProjectileInfo.Ins.Shoot_Projectile("FieldBoss/Shaga_Skill1Ground", this, null, 1f, + pc.transform.position, Skill1FrostTime, pb => + { + 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; + }); + }); + + //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()