diff --git a/Assets/Ino_nerdnavis.txt b/Assets/Ino_nerdnavis.txt index a86a8ccd9..20e6ea79f 100644 --- a/Assets/Ino_nerdnavis.txt +++ b/Assets/Ino_nerdnavis.txt @@ -85,4 +85,4 @@ PC 기본 공격 - 10402 궁수 //- 10501 모험가 //- 10502 수호 기사 -- 10601 워리어 +//- 10601 워리어 diff --git a/Assets/ResWork/Table/Export/EffectList.json b/Assets/ResWork/Table/Export/EffectList.json index fe4cbc22c..b6c9cafeb 100644 --- a/Assets/ResWork/Table/Export/EffectList.json +++ b/Assets/ResWork/Table/Export/EffectList.json @@ -1 +1 @@ -[{"n_EffectType": "1", "s_EffectPrefab": "Effect_MonsterSpawn", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "20"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Blood", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Burn", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Cure", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Curse", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_DefenceDecrease", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Freezing", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Frost", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_KnockBack", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_ManaShield", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Poison", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Slow", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_SpeedUp", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_StatUp", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_STR_EXTRA_SPLASH", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Stun", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Summoning", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_SwordShield", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_VampirHeal", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Hit_Bead", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "5"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Hit_Fireball", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "5"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Hit_IceBolt", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Hit_10101", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Hit_10102", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Hit_10201", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Hit_10202", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Hit_10501", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Hit_10502", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Dodge_Mage", "f_ProjectileLifeTime": "1", "n_PreLoadCount": "1"}, {"n_EffectType": "2", "s_EffectPrefab": "MeleeAttack", "f_ProjectileLifeTime": "0.02", "n_PreLoadCount": "10"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_10101", "f_ProjectileLifeTime": "0.02", "n_PreLoadCount": "2"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_10102", "f_ProjectileLifeTime": "0.02", "n_PreLoadCount": "2"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_10201", "f_ProjectileLifeTime": "0.02", "n_PreLoadCount": "4"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_10202", "f_ProjectileLifeTime": "0.02", "n_PreLoadCount": "4"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_10301", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "2"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_10302", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "2"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_10303", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "2"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_10501", "f_ProjectileLifeTime": "0.02", "n_PreLoadCount": "2"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_10502", "f_ProjectileLifeTime": "0.02", "n_PreLoadCount": "2"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_Flower", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "6"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_HeavyRain", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "25"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_INT_EXTRA_FREEZING", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "10"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_Meteor", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "5"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_PinkMagicArrow", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "2"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_PosionCloud", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "2"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_Suriken", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "1"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_ArcherArrow", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "12"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_ArcherSkill2Arrow", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "14"}] \ No newline at end of file +[{"n_EffectType": "1", "s_EffectPrefab": "Effect_MonsterSpawn", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "20"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Blood", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Burn", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Cure", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Curse", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_DefenceDecrease", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Freezing", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Frost", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_KnockBack", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_ManaShield", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Poison", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Slow", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_SpeedUp", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_StatUp", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_STR_EXTRA_SPLASH", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Stun", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Summoning", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_SwordShield", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_VampirHeal", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Hit_Bead", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "5"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Hit_Fireball", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "5"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Hit_IceBolt", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Hit_10101", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Hit_10102", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Hit_10201", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Hit_10202", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Hit_10501", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Hit_10502", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Hit_10601", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Dodge_Mage", "f_ProjectileLifeTime": "1", "n_PreLoadCount": "1"}, {"n_EffectType": "2", "s_EffectPrefab": "MeleeAttack", "f_ProjectileLifeTime": "0.02", "n_PreLoadCount": "10"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_10101", "f_ProjectileLifeTime": "0.02", "n_PreLoadCount": "2"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_10102", "f_ProjectileLifeTime": "0.02", "n_PreLoadCount": "2"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_10201", "f_ProjectileLifeTime": "0.02", "n_PreLoadCount": "4"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_10202", "f_ProjectileLifeTime": "0.02", "n_PreLoadCount": "4"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_10301", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "2"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_10302", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "2"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_10303", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "2"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_10501", "f_ProjectileLifeTime": "0.02", "n_PreLoadCount": "2"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_10502", "f_ProjectileLifeTime": "0.02", "n_PreLoadCount": "2"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_10601", "f_ProjectileLifeTime": "0.02", "n_PreLoadCount": "2"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_Flower", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "6"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_HeavyRain", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "25"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_INT_EXTRA_FREEZING", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "10"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_Meteor", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "5"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_PinkMagicArrow", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "2"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_PosionCloud", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "2"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_Suriken", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "1"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_ArcherArrow", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "12"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_ArcherSkill2Arrow", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "14"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/butler.xlsm b/Assets/ResWork/Table/butler.xlsm index 77170651d..fefc3347f 100644 Binary files a/Assets/ResWork/Table/butler.xlsm and b/Assets/ResWork/Table/butler.xlsm differ diff --git a/Assets/Res_Addr/Animations/Animation/TwoHand/2Handed@Attack1_S.FBX.meta b/Assets/Res_Addr/Animations/Animation/TwoHand/2Handed@Attack1_S.FBX.meta index 403456bf8..a06e22f48 100644 --- a/Assets/Res_Addr/Animations/Animation/TwoHand/2Handed@Attack1_S.FBX.meta +++ b/Assets/Res_Addr/Animations/Animation/TwoHand/2Handed@Attack1_S.FBX.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: 4ae4dac3a3223a14982bf05163a2d253 ModelImporter: - serializedVersion: 25 + serializedVersion: 22200 internalIDToNameTable: - first: 1: 100000 @@ -488,7 +488,7 @@ ModelImporter: second: ImportLogs externalObjects: {} materials: - importMaterials: 0 + materialImportMode: 0 materialName: 0 materialSearch: 1 materialLocation: 0 @@ -497,14 +497,15 @@ ModelImporter: bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 + removeConstantScaleCurves: 0 motionNodeName: Motion rigImportErrors: rigImportWarnings: animationImportErrors: animationImportWarnings: "\nClip 'Take 001' has import animation warnings that - might lower retargeting quality:\nNote: Activate translation DOF on avatar to - improve retargeting quality.\n\t'B_Spine' has translation animation that will - be discarded.\n\t'B_Spine1' has translation animation that will be discarded.\n" + might lower retargeting quality:\nNote: Activate translation DOF on avatar + to improve retargeting quality.\n\t'B_Spine' has translation animation that + will be discarded.\n\t'B_Spine1' has translation animation that will be discarded.\n" animationRetargetingWarnings: animationDoRetargetingWarnings: 0 importAnimatedCustomProperties: 0 @@ -557,8 +558,8 @@ ModelImporter: intParameter: 0 messageOptions: 0 - time: 0.47916666 - functionName: Hit - data: + functionName: Projectile + data: Projectile_10601 objectReferenceParameter: {instanceID: 0} floatParameter: 0 intParameter: 0 @@ -696,26 +697,36 @@ ModelImporter: meshCompression: 0 addColliders: 0 useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 importVisibility: 0 importBlendShapes: 0 importCameras: 0 importLights: 0 + nodeNameCollisionStrategy: 0 + fileIdsGeneration: 1 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 keepQuads: 0 weldVertices: 0 + bakeAxisConversion: 0 preserveHierarchy: 0 skinWeightsMode: 0 maxBonesPerVertex: 4 minBoneWeight: 0.001 + optimizeBones: 1 meshOptimizationFlags: 0 indexFormat: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 0 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 useFileScale: 0 + strictVertexDataChecks: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 2 @@ -726,7 +737,6 @@ ModelImporter: normalSmoothingSource: 0 referencedClips: [] importAnimation: 1 - copyAvatar: 1 humanDescription: serializedVersion: 3 human: @@ -1435,8 +1445,13 @@ ModelImporter: skeletonHasParents: 0 lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: 781a15e490c144941adf6440cf6b6cdd, type: 3} + autoGenerateAvatarMappingIfUnspecified: 1 animationType: 3 humanoidOversampling: 1 + avatarSetup: 2 + addHumanoidExtraRootOnlyWhenUsingAvatar: 0 + importBlendShapeDeformPercent: 0 + remapMaterialsIfMaterialImportModeIsNone: 1 additionalBone: 0 userData: assetBundleName: diff --git a/Assets/Res_Addr/Effect/Effect_Hit_10601.prefab b/Assets/Res_Addr/Effect/Effect_Hit_10601.prefab new file mode 100644 index 000000000..2320ef6ce --- /dev/null +++ b/Assets/Res_Addr/Effect/Effect_Hit_10601.prefab @@ -0,0 +1,126 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &9208126588685671643 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3817062764911921388} + - component: {fileID: 8522107567523860881} + m_Layer: 0 + m_Name: Effect_Hit_10601 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3817062764911921388 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9208126588685671643} + 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: 6568684871415058650} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8522107567523860881 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9208126588685671643} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 456d2bd1c5c2e5e4b8b948836c4975a4, type: 3} + m_Name: + m_EditorClassIdentifier: + NoUseParticleTime: 1 + OffTime: 0.5 + add_offset: {x: 0, y: 0, z: 0} + e_EffectLocation: 1 + tf_Target: {fileID: 0} +--- !u!1001 &6387254594295122232 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3817062764911921388} + m_Modifications: + - target: {fileID: 255788326938483169, guid: 09eaf0dd98afc4049ade8c1ae00073ad, + type: 3} + propertyPath: m_Name + value: Hit_snow + objectReference: {fileID: 0} + - target: {fileID: 255788326938483170, guid: 09eaf0dd98afc4049ade8c1ae00073ad, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 255788326938483170, guid: 09eaf0dd98afc4049ade8c1ae00073ad, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 255788326938483170, guid: 09eaf0dd98afc4049ade8c1ae00073ad, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 255788326938483170, guid: 09eaf0dd98afc4049ade8c1ae00073ad, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 255788326938483170, guid: 09eaf0dd98afc4049ade8c1ae00073ad, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 255788326938483170, guid: 09eaf0dd98afc4049ade8c1ae00073ad, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 255788326938483170, guid: 09eaf0dd98afc4049ade8c1ae00073ad, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 255788326938483170, guid: 09eaf0dd98afc4049ade8c1ae00073ad, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 255788326938483170, guid: 09eaf0dd98afc4049ade8c1ae00073ad, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 255788326938483170, guid: 09eaf0dd98afc4049ade8c1ae00073ad, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 09eaf0dd98afc4049ade8c1ae00073ad, type: 3} +--- !u!4 &6568684871415058650 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 255788326938483170, guid: 09eaf0dd98afc4049ade8c1ae00073ad, + type: 3} + m_PrefabInstance: {fileID: 6387254594295122232} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Res_Addr/Effect/Effect_Hit_10601.prefab.meta b/Assets/Res_Addr/Effect/Effect_Hit_10601.prefab.meta new file mode 100644 index 000000000..d92dc62d2 --- /dev/null +++ b/Assets/Res_Addr/Effect/Effect_Hit_10601.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: eeffae8973d6d2c4b8fd314c260a43bb +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Res_Addr/Projectile/Projectile_10601.prefab b/Assets/Res_Addr/Projectile/Projectile_10601.prefab new file mode 100644 index 000000000..0f6552767 --- /dev/null +++ b/Assets/Res_Addr/Projectile/Projectile_10601.prefab @@ -0,0 +1,71 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !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: Projectile_10601 + 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: [] + 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: 1 + str_HitEffect: Effect_Hit_10601 + 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: 1.5, y: 3, z: 2} + m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Res_Addr/Projectile/Projectile_10601.prefab.meta b/Assets/Res_Addr/Projectile/Projectile_10601.prefab.meta new file mode 100644 index 000000000..ca9f09c66 --- /dev/null +++ b/Assets/Res_Addr/Projectile/Projectile_10601.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3a4ab7027408f6c42b99a4a3a70c173d +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: