diff --git a/Assets/ResWork/Suriyun/Monster Pack Darkness/Animations/Prizon/Anim_Prizon@Attack.fbx.meta b/Assets/ResWork/Suriyun/Monster Pack Darkness/Animations/Prizon/Anim_Prizon@Attack.fbx.meta index 7401823cb..52ca36715 100644 --- a/Assets/ResWork/Suriyun/Monster Pack Darkness/Animations/Prizon/Anim_Prizon@Attack.fbx.meta +++ b/Assets/ResWork/Suriyun/Monster Pack Darkness/Animations/Prizon/Anim_Prizon@Attack.fbx.meta @@ -1,57 +1,149 @@ fileFormatVersion: 2 guid: 85400de9534c3064ba6f0dd3efb35cc8 ModelImporter: - serializedVersion: 23 - fileIDToRecycleName: - 100000: //RootNode - 100002: calf_l - 100004: calf_r - 100006: chain_01 - 100008: chain_02 - 100010: chain_03 - 100012: chain_04 - 100014: chain_05 - 100016: chain_06 - 100018: foot_l - 100020: foot_r - 100022: hand_l - 100024: hand_r - 100026: head - 100028: pelvis - 100030: root - 100032: spine_01 - 100034: spine_02 - 100036: thigh_l - 100038: thigh_r - 100040: upperarm_l - 100042: upperarm_r - 400000: //RootNode - 400002: calf_l - 400004: calf_r - 400006: chain_01 - 400008: chain_02 - 400010: chain_03 - 400012: chain_04 - 400014: chain_05 - 400016: chain_06 - 400018: foot_l - 400020: foot_r - 400022: hand_l - 400024: hand_r - 400026: head - 400028: pelvis - 400030: root - 400032: spine_01 - 400034: spine_02 - 400036: thigh_l - 400038: thigh_r - 400040: upperarm_l - 400042: upperarm_r - 7400000: Attack - 9500000: //RootNode + serializedVersion: 22200 + internalIDToNameTable: + - first: + 1: 100000 + second: //RootNode + - first: + 1: 100002 + second: calf_l + - first: + 1: 100004 + second: calf_r + - first: + 1: 100006 + second: chain_01 + - first: + 1: 100008 + second: chain_02 + - first: + 1: 100010 + second: chain_03 + - first: + 1: 100012 + second: chain_04 + - first: + 1: 100014 + second: chain_05 + - first: + 1: 100016 + second: chain_06 + - first: + 1: 100018 + second: foot_l + - first: + 1: 100020 + second: foot_r + - first: + 1: 100022 + second: hand_l + - first: + 1: 100024 + second: hand_r + - first: + 1: 100026 + second: head + - first: + 1: 100028 + second: pelvis + - first: + 1: 100030 + second: root + - first: + 1: 100032 + second: spine_01 + - first: + 1: 100034 + second: spine_02 + - first: + 1: 100036 + second: thigh_l + - first: + 1: 100038 + second: thigh_r + - first: + 1: 100040 + second: upperarm_l + - first: + 1: 100042 + second: upperarm_r + - first: + 4: 400000 + second: //RootNode + - first: + 4: 400002 + second: calf_l + - first: + 4: 400004 + second: calf_r + - first: + 4: 400006 + second: chain_01 + - first: + 4: 400008 + second: chain_02 + - first: + 4: 400010 + second: chain_03 + - first: + 4: 400012 + second: chain_04 + - first: + 4: 400014 + second: chain_05 + - first: + 4: 400016 + second: chain_06 + - first: + 4: 400018 + second: foot_l + - first: + 4: 400020 + second: foot_r + - first: + 4: 400022 + second: hand_l + - first: + 4: 400024 + second: hand_r + - first: + 4: 400026 + second: head + - first: + 4: 400028 + second: pelvis + - first: + 4: 400030 + second: root + - first: + 4: 400032 + second: spine_01 + - first: + 4: 400034 + second: spine_02 + - first: + 4: 400036 + second: thigh_l + - first: + 4: 400038 + second: thigh_r + - first: + 4: 400040 + second: upperarm_l + - first: + 4: 400042 + second: upperarm_r + - first: + 74: 7400000 + second: Attack + - first: + 95: 9500000 + second: //RootNode externalObjects: {} materials: - importMaterials: 1 + materialImportMode: 1 materialName: 0 materialSearch: 1 materialLocation: 1 @@ -60,6 +152,7 @@ ModelImporter: bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 + removeConstantScaleCurves: 0 motionNodeName: rigImportErrors: rigImportWarnings: @@ -80,6 +173,7 @@ ModelImporter: - serializedVersion: 16 name: Attack takeName: Anim_Prizon@Attack + internalID: 0 firstFrame: 81 lastFrame: 100 wrapMode: 0 @@ -100,11 +194,18 @@ ModelImporter: mirror: 0 bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 curves: [] - events: [] + events: + - time: 0.25853655 + functionName: Projectile + data: + objectReferenceParameter: {instanceID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 transformMask: [] maskType: 3 maskSource: {instanceID: 0} - additiveReferencePoseFrame: 0 + additiveReferencePoseFrame: 81 isReadable: 1 meshes: lODScreenPercentages: [] @@ -112,25 +213,36 @@ ModelImporter: meshCompression: 0 addColliders: 0 useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 importVisibility: 1 importBlendShapes: 1 importCameras: 1 importLights: 1 + nodeNameCollisionStrategy: 0 + fileIdsGeneration: 1 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 - optimizeMeshForGPU: 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 - previousCalculatedGlobalScale: 0.01 - hasPreviousCalculatedGlobalScale: 1 + strictVertexDataChecks: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 @@ -139,10 +251,10 @@ ModelImporter: legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 blendShapeNormalImportMode: 1 normalSmoothingSource: 0 + referencedClips: [] importAnimation: 1 - copyAvatar: 0 humanDescription: - serializedVersion: 2 + serializedVersion: 3 human: [] skeleton: [] armTwist: 0.5 @@ -152,13 +264,19 @@ ModelImporter: 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: 1 + addHumanoidExtraRootOnlyWhenUsingAvatar: 0 + importBlendShapeDeformPercent: 0 + remapMaterialsIfMaterialImportModeIsNone: 1 additionalBone: 0 userData: assetBundleName: diff --git a/Assets/Res_Addr/Projectile/Mob/P_Prizon_01.prefab b/Assets/Res_Addr/Projectile/Mob/P_Prizon_01.prefab new file mode 100644 index 000000000..ad627ec74 --- /dev/null +++ b/Assets/Res_Addr/Projectile/Mob/P_Prizon_01.prefab @@ -0,0 +1,155 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &359492963229537179 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3212436743952790601} + - component: {fileID: 2864512912963179641} + - component: {fileID: 5611405915983910845} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &3212436743952790601 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 359492963229537179} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 3, y: 3, z: 3} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 223961062764596305} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2864512912963179641 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 359492963229537179} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &5611405915983910845 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 359492963229537179} + 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: 10306, guid: 0000000000000000f000000000000000, type: 0} + 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!1 &907428178798376589 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 223961062764596305} + - component: {fileID: 6311613290837446200} + - component: {fileID: 6782093134866277011} + m_Layer: 0 + m_Name: P_Prizon_01 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &223961062764596305 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 907428178798376589} + 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: 3212436743952790601} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6311613290837446200 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 907428178798376589} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e5d2fd9d460da6a4d87b4be83a4cdc32, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Pierce: 0 + str_HitEffect: MagicMissileHit + m_ShowTimeOverEffect: 0 +--- !u!65 &6782093134866277011 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 907428178798376589} + 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} diff --git a/Assets/Res_Addr/Projectile/Mob/P_Prizon_01.prefab.meta b/Assets/Res_Addr/Projectile/Mob/P_Prizon_01.prefab.meta new file mode 100644 index 000000000..d47cc899b --- /dev/null +++ b/Assets/Res_Addr/Projectile/Mob/P_Prizon_01.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 80d85d3c6e42a1f48bf7eb8667055175 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Res_Addr/Projectile/Mob/P_Prizon_02.prefab b/Assets/Res_Addr/Projectile/Mob/P_Prizon_02.prefab new file mode 100644 index 000000000..7dbdbcc12 --- /dev/null +++ b/Assets/Res_Addr/Projectile/Mob/P_Prizon_02.prefab @@ -0,0 +1,155 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &359492963229537179 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3212436743952790601} + - component: {fileID: 2864512912963179641} + - component: {fileID: 5611405915983910845} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &3212436743952790601 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 359492963229537179} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 3, y: 3, z: 3} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 223961062764596305} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2864512912963179641 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 359492963229537179} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &5611405915983910845 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 359492963229537179} + 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: 10306, guid: 0000000000000000f000000000000000, type: 0} + 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!1 &907428178798376589 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 223961062764596305} + - component: {fileID: 6311613290837446200} + - component: {fileID: 6782093134866277011} + m_Layer: 0 + m_Name: P_Prizon_02 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &223961062764596305 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 907428178798376589} + 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: 3212436743952790601} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6311613290837446200 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 907428178798376589} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e5d2fd9d460da6a4d87b4be83a4cdc32, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Pierce: 0 + str_HitEffect: MagicMissileHit + m_ShowTimeOverEffect: 0 +--- !u!65 &6782093134866277011 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 907428178798376589} + 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} diff --git a/Assets/Res_Addr/Projectile/Mob/P_Prizon_02.prefab.meta b/Assets/Res_Addr/Projectile/Mob/P_Prizon_02.prefab.meta new file mode 100644 index 000000000..215679122 --- /dev/null +++ b/Assets/Res_Addr/Projectile/Mob/P_Prizon_02.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: caeee941b1da67d47b9740d2e4d37878 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Res_Addr/Projectile/Mob/P_Prizon_03.prefab b/Assets/Res_Addr/Projectile/Mob/P_Prizon_03.prefab new file mode 100644 index 000000000..d89251e3d --- /dev/null +++ b/Assets/Res_Addr/Projectile/Mob/P_Prizon_03.prefab @@ -0,0 +1,155 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &359492963229537179 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3212436743952790601} + - component: {fileID: 2864512912963179641} + - component: {fileID: 5611405915983910845} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &3212436743952790601 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 359492963229537179} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 3, y: 3, z: 3} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 223961062764596305} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2864512912963179641 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 359492963229537179} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &5611405915983910845 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 359492963229537179} + 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: 10306, guid: 0000000000000000f000000000000000, type: 0} + 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!1 &907428178798376589 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 223961062764596305} + - component: {fileID: 6311613290837446200} + - component: {fileID: 6782093134866277011} + m_Layer: 0 + m_Name: P_Prizon_03 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &223961062764596305 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 907428178798376589} + 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: 3212436743952790601} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6311613290837446200 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 907428178798376589} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e5d2fd9d460da6a4d87b4be83a4cdc32, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Pierce: 0 + str_HitEffect: MagicMissileHit + m_ShowTimeOverEffect: 0 +--- !u!65 &6782093134866277011 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 907428178798376589} + 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} diff --git a/Assets/Res_Addr/Projectile/Mob/P_Prizon_03.prefab.meta b/Assets/Res_Addr/Projectile/Mob/P_Prizon_03.prefab.meta new file mode 100644 index 000000000..6e2f81786 --- /dev/null +++ b/Assets/Res_Addr/Projectile/Mob/P_Prizon_03.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 989cf52e0b4d7dd47ab255dbb83b02e4 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/Character/Actor.cs b/Assets/Script/Character/Actor.cs index 893cdaffa..f8cc2b704 100644 --- a/Assets/Script/Character/Actor.cs +++ b/Assets/Script/Character/Actor.cs @@ -301,7 +301,7 @@ public class Actor : MyCoroutine m_attackCoolTime = cooltime; } - public virtual DamageInfo Get_DamageInfo(ProjectileData _pd, double _attackrate = 1d, bool forceCri = false) + public virtual DamageInfo Get_DamageInfo(ProjectileData _pd, bool forceCri = false) { var atkData = Get_CCData(eCC.ATK_Up); var addAtk = atkData.CCTime > 0 ? atkData.CCDmg : 0f; @@ -317,7 +317,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 * _attackrate; + 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)); @@ -1379,9 +1379,10 @@ public class Actor : MyCoroutine { var ccData = dic_ccData[cc]; var gapTime = (float)ccData.CCDelay; + dinfocopy.Beater_pd.AddDmgPercent = (float)ccData.CCDmg; while (ccData.CCTime > 0) { - var dinfo = dinfocopy.Beater.Get_DamageInfo(dinfocopy.Beater_pd, ccData.CCDmg); + var dinfo = dinfocopy.Beater.Get_DamageInfo(dinfocopy.Beater_pd); dinfo.TextColor = $"{cc} "; Cal_Damage(dinfo); yield return new WaitForSeconds(gapTime); diff --git a/Assets/Script/Character/Mob/Boss/Boss_LusifActor.cs b/Assets/Script/Character/Mob/Boss/Boss_LusifActor.cs index cfdf0ca69..de457e691 100644 --- a/Assets/Script/Character/Mob/Boss/Boss_LusifActor.cs +++ b/Assets/Script/Character/Mob/Boss/Boss_LusifActor.cs @@ -10,6 +10,8 @@ public class Boss_LusifActor : BossMobActor public int Skill2ProjectileCount = 5; [Header("스킬2 발사 딜레이 시간")] public float Skill2Delay = 0.8f; + [Header("스킬2 데미지")] + public float Skill2Dmg = 1.5f; public Transform tf_Attack; int Skill2Count; @@ -76,7 +78,7 @@ public class Boss_LusifActor : BossMobActor void BossProjectile2(string s) { if (ProjectileInfo.ProjectileInfoOn) - ProjectileInfo.Ins.Shoot_Projectile(m_MonsterTableData.s_Porjectile2, this, m_Target, 1f, Get_CenterPositionFoward(), + ProjectileInfo.Ins.Shoot_Projectile(m_MonsterTableData.s_Porjectile2, this, m_Target, Skill2Dmg, Get_CenterPositionFoward(), m_MonsterTableData.f_ProjectileLifeTime2); } void BossProjectile3(string s) diff --git a/Assets/Script/Character/Mob/MobActor.cs b/Assets/Script/Character/Mob/MobActor.cs index 0ec38e706..45e996d89 100644 --- a/Assets/Script/Character/Mob/MobActor.cs +++ b/Assets/Script/Character/Mob/MobActor.cs @@ -422,9 +422,9 @@ public class MobActor : Actor base.Shoot_Skill(); Reset_AttackCoolTime(); } - public override DamageInfo Get_DamageInfo(ProjectileData _pd, double _attackrate = 1, bool forceCri = false) + public override DamageInfo Get_DamageInfo(ProjectileData _pd, bool forceCri = false) { - var dinfo = base.Get_DamageInfo(_pd, _attackrate, forceCri); + var dinfo = base.Get_DamageInfo(_pd, forceCri); if (m_Stat.Get_Stat(eStat.DMG_TO_HP) > 0d) dinfo.act_returnLastDmg = Get_LastDmg; if (m_MonsterTableData.n_PassiveSkillID > 0) diff --git a/Assets/Script/Character/Projectile/MagicMissile.cs b/Assets/Script/Character/Projectile/MagicMissile.cs index 32d86d817..6c4d5e6dc 100644 --- a/Assets/Script/Character/Projectile/MagicMissile.cs +++ b/Assets/Script/Character/Projectile/MagicMissile.cs @@ -49,7 +49,7 @@ public class MagicMissile : ProjectileBase if (m_ProjecTileData.IsSkill()) m_ProjecTileData.target.Get_Damage(Get_DamageInfo()); else - m_ProjecTileData.target.Get_Damage(m_ProjecTileData.shooter.Get_DamageInfo(m_ProjecTileData, m_ProjecTileData.HitDamage)); + m_ProjecTileData.target.Get_Damage(m_ProjecTileData.shooter.Get_DamageInfo(m_ProjecTileData)); if (BounceCount > 0) { diff --git a/Assets/Script/Character/Projectile/ProjectileBase.cs b/Assets/Script/Character/Projectile/ProjectileBase.cs index dd115826f..0602b08ef 100644 --- a/Assets/Script/Character/Projectile/ProjectileBase.cs +++ b/Assets/Script/Character/Projectile/ProjectileBase.cs @@ -16,7 +16,7 @@ public class ProjectileData public SkillTypeConfigTableData m_skillTypeConfigTable; public eEffect m_Skill = eEffect.None; public eSkillExtraType e_SkillExtraType = eSkillExtraType.None; - public float Speed = 5f, LifeTime = 4f, HitDamage, DamageArea; + public float Speed = 5f, LifeTime = 4f, DamageArea; public eProjectileStartPos eStartPos = eProjectileStartPos.None; public Vector3 v3_StartPos; public bool SetSkillExtraType = true, IsRandomPos, LookTarget = true, CheckOptionWhenStart = true; @@ -24,19 +24,25 @@ public class ProjectileData public Action Action_OnHit; ObscuredDouble _BaseDmg; - ObscuredFloat _AddDmgPercent, _CC_AddTime, _CC_AddDmg, _CC_AddVal1, _CC_AddVal2; - public ObscuredDouble BaseDmg { get { return _BaseDmg; } set { _BaseDmg = value; _BaseDmg.RandomizeCryptoKey(); } } - public ObscuredFloat AddDmgPercent { get { return _AddDmgPercent; } set { _AddDmgPercent = value; _AddDmgPercent.RandomizeCryptoKey(); } } - public ObscuredFloat CC_AddTime { get { return _CC_AddTime; } set { _CC_AddTime = value; _CC_AddTime.RandomizeCryptoKey(); } } - public ObscuredFloat CC_AddDmg { get { return _CC_AddDmg; } set { _CC_AddDmg = value; _CC_AddDmg.RandomizeCryptoKey(); } } - public ObscuredFloat CC_AddVal1 { get { return _CC_AddVal1; } set { _CC_AddVal1 = value; _CC_AddVal1.RandomizeCryptoKey(); } } - public ObscuredFloat CC_AddVal2 { get { return _CC_AddVal2; } set { _CC_AddVal2 = value; _CC_AddVal2.RandomizeCryptoKey(); } } + ObscuredFloat _AddDmgPercent = 1f, _CC_AddTime, _CC_AddDmg, _CC_AddVal1, _CC_AddVal2; + public double BaseDmg { get { return _BaseDmg; } set { _BaseDmg = value; _BaseDmg.RandomizeCryptoKey(); } } + public float AddDmgPercent { get { return _AddDmgPercent; } + set + { + _AddDmgPercent = value; + _AddDmgPercent.RandomizeCryptoKey(); + } + } + public float CC_AddTime { get { return _CC_AddTime; } set { _CC_AddTime = value; _CC_AddTime.RandomizeCryptoKey(); } } + public float CC_AddDmg { get { return _CC_AddDmg; } set { _CC_AddDmg = value; _CC_AddDmg.RandomizeCryptoKey(); } } + public float CC_AddVal1 { get { return _CC_AddVal1; } set { _CC_AddVal1 = value; _CC_AddVal1.RandomizeCryptoKey(); } } + public float CC_AddVal2 { get { return _CC_AddVal2; } set { _CC_AddVal2 = value; _CC_AddVal2.RandomizeCryptoKey(); } } public void Reset() { shooter = null; target = null; - HitDamage = 0f; + AddDmgPercent = 1f; eStartPos = eProjectileStartPos.ShooterCenter; v3_StartPos = Vector3.zero; LifeTime = 4f; @@ -93,7 +99,7 @@ public class ProjectileData pd.Speed = Speed; pd.v3_StartPos = v3_StartPos; pd.eStartPos = eStartPos; - pd.HitDamage = HitDamage; + pd.AddDmgPercent = AddDmgPercent; pd.BaseDmg = BaseDmg; pd.CC_AddTime = CC_AddTime; pd.CC_AddDmg = CC_AddDmg; @@ -141,7 +147,7 @@ public class ProjectileBase : MonoBehaviour public virtual void Set(ProjectileData _data) { - _data.AddDmgPercent = _data.CC_AddTime = _data.CC_AddDmg = _data.CC_AddVal1 = _data.CC_AddVal2 = 0f; + _data.CC_AddTime = _data.CC_AddDmg = _data.CC_AddVal1 = _data.CC_AddVal2 = 0f; _data.Copy(m_ProjecTileData); m_ProjecTileData.m_ProjectileBase = this; m_DamageInfo = Get_NewDamageInfo(); @@ -254,7 +260,8 @@ public class ProjectileBase : MonoBehaviour public ProjectileData Get_ProjectTileData() { return m_ProjecTileData; } DamageInfo Get_SkillDamage() { - var dinfo = m_ProjecTileData.shooter.Get_DamageInfo(m_ProjecTileData, m_ProjecTileData.Get_SkillDamagePercent(), + m_ProjecTileData.AddDmgPercent = m_ProjecTileData.Get_SkillDamagePercent(); + var dinfo = m_ProjecTileData.shooter.Get_DamageInfo(m_ProjecTileData, m_ProjecTileData.CC_AddVal2 > 0 && m_ProjecTileData.m_SkillListTableData.e_Skill == eEffect.Skill_IceBolt && m_ProjecTileData.target.IsSkillExtraStatus(eSkillExtraType.Frost)); dinfo.act_returnLastDmg = act_returnDmg; @@ -267,7 +274,7 @@ public class ProjectileBase : MonoBehaviour } protected DamageInfo Get_DamageInfo(bool extradmg = false, bool calcri = true) { - m_DamageInfo.Damage = m_DamageInfo.BaseDmg; + m_DamageInfo.Damage = m_DamageInfo.Damage; 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/Character/Projectile/SelectSkill/Select_BodyonFire.cs b/Assets/Script/Character/Projectile/SelectSkill/Select_BodyonFire.cs index 9db651a1c..5424a4d79 100644 --- a/Assets/Script/Character/Projectile/SelectSkill/Select_BodyonFire.cs +++ b/Assets/Script/Character/Projectile/SelectSkill/Select_BodyonFire.cs @@ -13,7 +13,7 @@ public class Select_BodyonFire : ProjectileBase DagameTime = 0.2f; FireTime = 5f; - DamageRate = table_selectskill.Ins.Get_Data(eEffect.Select_BodyonFire).ValueBase; + m_ProjecTileData.AddDmgPercent = table_selectskill.Ins.Get_Data(eEffect.Select_BodyonFire).ValueBase; } private void Update() @@ -27,7 +27,7 @@ public class Select_BodyonFire : ProjectileBase DagameTime = 0.2f; var enemies = Get_Enemies(transform, 2.5f); for (int i = 0; i < enemies.Count; i++) - enemies[i].Get_Damage(m_ProjecTileData.shooter.Get_DamageInfo(m_ProjecTileData, DamageRate)); + enemies[i].Get_Damage(m_ProjecTileData.shooter.Get_DamageInfo(m_ProjecTileData)); } } else diff --git a/Assets/Script/Character/Projectile/Skill/Skill_Golem.cs b/Assets/Script/Character/Projectile/Skill/Skill_Golem.cs index 1ba0f6891..7ad0a7612 100644 --- a/Assets/Script/Character/Projectile/Skill/Skill_Golem.cs +++ b/Assets/Script/Character/Projectile/Skill/Skill_Golem.cs @@ -25,11 +25,11 @@ public class Skill_Golem : ProjectileBase { e_SkillExtraType = pd_meteor.e_SkillExtraType, f_ExtraValue1 = Get_AwakenData(2, 1), // 스턴 시간 - f_ExtraValue4 = 1f, // 스턴 + f_ExtraValue4 = 1f, // 스턴 확률 }; pd_meteor.m_skillTypeConfigTable = table_skilltypeconfig.Ins.Get_Data_orNull(pd_meteor.e_SkillExtraType); } - pd_meteor.v3_StartPos = _data.shooter.Get_position() + Vector3.forward; + pd_meteor.v3_StartPos = _data.shooter.Get_CenterPositionFoward(1f); m_LifeTime = _data.LifeTime = lifeTime + (IsStep(1) ? Get_AwakenData(1, 1) : 0f); if (IsStep(2)) @@ -54,12 +54,12 @@ public class Skill_Golem : ProjectileBase InGameInfo.Ins.Show_Effect("Effect_Burn", summon, eEffectLocation.Bottom, m_LifeTime); var area = Get_AwakenData(3, 1); var delay = Get_AwakenData(3, 2); - var dmgRate = Get_AwakenData(3, 3); + m_ProjecTileData.AddDmgPercent = Get_AwakenData(3, 3); while (m_LifeTime > 0f) { yield return new WaitForSeconds(delay); var enemies = Get_Enemies(summon.transform, area); - enemies.ForEach(f => f.Get_Damage(summon.Get_DamageInfo(null, dmgRate))); + enemies.ForEach(f => f.Get_Damage(summon.Get_DamageInfo(m_ProjecTileData))); m_LifeTime -= delay; } diff --git a/Assets/Script/Info/ProjectileInfo.cs b/Assets/Script/Info/ProjectileInfo.cs index fc37800db..78336a5da 100644 --- a/Assets/Script/Info/ProjectileInfo.cs +++ b/Assets/Script/Info/ProjectileInfo.cs @@ -85,7 +85,7 @@ public class ProjectileInfo : MonoBehaviour pd.shooter = shooter; pd.target = target; - pd.HitDamage = adddmgrate; + pd.AddDmgPercent = adddmgrate; pd.LifeTime = liftTime; if (startpos.HasValue)