diff --git a/assets/resources/game/skill/anm/atk/atk01.anim b/assets/resources/game/skill/anm/atk/atk01.anim index a124253c..b65cf129 100644 --- a/assets/resources/game/skill/anm/atk/atk01.anim +++ b/assets/resources/game/skill/anm/atk/atk01.anim @@ -7,25 +7,22 @@ "embeddedPlayerGroups": [] }, "_native": "", - "sample": 20, + "sample": 8, "speed": 1, "wrapMode": 2, "enableTrsBlending": false, - "_duration": 0.1, + "_duration": 0.25, "_hash": 500763545, "_tracks": [ { "__id__": 1 - }, - { - "__id__": 7 } ], "_exoticAnimation": null, "_events": [], "_embeddedPlayers": [], "_additiveSettings": { - "__id__": 18 + "__id__": 7 }, "_auxiliaryCurveEntries": [] }, @@ -70,222 +67,21 @@ }, { "__type__": "cc.ObjectCurve", - "_times": [], - "_values": [] - }, - { - "__type__": "cc.animation.VectorTrack", - "_binding": { - "__type__": "cc.animation.TrackBinding", - "path": { - "__id__": 8 - }, - "proxy": null - }, - "_channels": [ - { - "__id__": 10 - }, - { - "__id__": 12 - }, - { - "__id__": 14 - }, - { - "__id__": 16 - } + "_times": [ + 0, + 0.125 ], - "_nComponents": 3 - }, - { - "__type__": "cc.animation.TrackPath", - "_paths": [ + "_values": [ { - "__id__": 9 + "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@39989", + "__expectedType__": "cc.SpriteFrame" }, - "scale" + { + "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@16ca6", + "__expectedType__": "cc.SpriteFrame" + } ] }, - { - "__type__": "cc.animation.HierarchyPath", - "path": "Node" - }, - { - "__type__": "cc.animation.Channel", - "_curve": { - "__id__": 11 - } - }, - { - "__type__": "cc.RealCurve", - "_times": [ - 0, - 0.05000000074505806, - 0.10000000149011612 - ], - "_values": [ - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": -2.5, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null - }, - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": -2.5, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null - }, - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": -2.5, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null - } - ], - "preExtrapolation": 1, - "postExtrapolation": 1 - }, - { - "__type__": "cc.animation.Channel", - "_curve": { - "__id__": 13 - } - }, - { - "__type__": "cc.RealCurve", - "_times": [ - 0, - 0.05000000074505806, - 0.10000000149011612 - ], - "_values": [ - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 2.5, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null - }, - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 2.5, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null - }, - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 2.5, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null - } - ], - "preExtrapolation": 1, - "postExtrapolation": 1 - }, - { - "__type__": "cc.animation.Channel", - "_curve": { - "__id__": 15 - } - }, - { - "__type__": "cc.RealCurve", - "_times": [ - 0, - 0.05000000074505806, - 0.10000000149011612 - ], - "_values": [ - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 1, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null - }, - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 1, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null - }, - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 1, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null - } - ], - "preExtrapolation": 1, - "postExtrapolation": 1 - }, - { - "__type__": "cc.animation.Channel", - "_curve": { - "__id__": 17 - } - }, - { - "__type__": "cc.RealCurve", - "_times": [], - "_values": [], - "preExtrapolation": 1, - "postExtrapolation": 1 - }, { "__type__": "cc.AnimationClipAdditiveSettings", "enabled": false, diff --git a/assets/resources/game/skill/atk/atk.prefab b/assets/resources/game/skill/atk/atk.prefab index 19123638..65add8ad 100644 --- a/assets/resources/game/skill/atk/atk.prefab +++ b/assets/resources/game/skill/atk/atk.prefab @@ -35,10 +35,13 @@ }, { "__id__": 14 + }, + { + "__id__": 16 } ], "_prefab": { - "__id__": 16 + "__id__": 18 }, "_lpos": { "__type__": "cc.Vec3", @@ -92,8 +95,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -3.417, - "y": 18.168, + "x": 0, + "y": 0, "z": 0 }, "_lrot": { @@ -105,8 +108,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -1, - "y": 1.2, + "x": -0.5, + "y": 0.5, "z": 1 }, "_mobility": 0, @@ -133,8 +136,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 60, - "height": 60 + "width": 139, + "height": 128 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -169,10 +172,13 @@ "b": 255, "a": 255 }, - "_spriteFrame": null, + "_spriteFrame": { + "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@39989", + "__expectedType__": "cc.SpriteFrame" + }, "_type": 0, "_fillType": 0, - "_sizeMode": 0, + "_sizeMode": 1, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -201,6 +207,8 @@ "__id__": 0 }, "fileId": "3arqAMBz1MvoXBzeDaL5M/", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -218,7 +226,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 30, - "height": 100 + "height": 50 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -245,7 +253,6 @@ }, "atk_x": 0, "atk_y": 0, - "debugMode": false, "_id": "" }, { @@ -312,7 +319,7 @@ "_size": { "__type__": "cc.Size", "width": 30, - "height": 150 + "height": 50 }, "_id": "" }, @@ -320,6 +327,35 @@ "__type__": "cc.CompPrefabInfo", "fileId": "ebw5mObxNGGKxnJXDgX5gl" }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 17 + }, + "playOnLoad": false, + "_clips": [ + { + "__uuid__": "45017156-064b-43f2-a24e-176b6ce17ad8", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "45017156-064b-43f2-a24e-176b6ce17ad8", + "__expectedType__": "cc.AnimationClip" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "20U0hP/NZErJJXRCEib1lq" + }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/script/game/common/config/SkillSet.ts b/assets/script/game/common/config/SkillSet.ts index 3d2e23d9..0de61e3d 100644 --- a/assets/script/game/common/config/SkillSet.ts +++ b/assets/script/game/common/config/SkillSet.ts @@ -174,7 +174,7 @@ export const SkillSet: Record = { 6001: { uuid:6001,name:"普通攻击",sp_name:"atk",icon:"1026",TGroup:TGroup.Enemy,readyAnm:"",endAnm:"",act:"atk", DTType:DTType.single,ap:100,hit_count:1,hitcd:0.2,speed:720,with:0,ready:0.2,EAnm:0,DAnm:"",IType:IType.Melee, - RType:RType.bezier,EType:EType.collision,buffs:[],info:"造成攻击力100%的伤害", + RType:RType.linear,EType:EType.collision,buffs:[],info:"造成攻击力100%的伤害", }, 6002: { uuid:6002,name:"火球术",sp_name:"ball_fire",icon:"1126",TGroup:TGroup.Enemy,readyAnm:"",endAnm:"",act:"atk", diff --git a/assets/script/game/common/config/heroSet.ts b/assets/script/game/common/config/heroSet.ts index ef9f27e2..5f0f08b5 100644 --- a/assets/script/game/common/config/heroSet.ts +++ b/assets/script/game/common/config/heroSet.ts @@ -126,15 +126,15 @@ export interface HSkillInfo { export const HeroInfo: Record = { // ========== 近战英雄 ========== - 5001:{uuid:5001,name:"见习战士",path:"hk2", fac:FacSet.HERO,cards_lv:1,lv:1,type:HType.Melee,dis:120,hp:150,ap:25,speed:800,atking:[{s_uuid:6301,t_num:2}], + 5001:{uuid:5001,name:"见习战士",path:"hk2", fac:FacSet.HERO,cards_lv:1,lv:1,type:HType.Melee,dis:720,hp:150,ap:25,speed:800,atking:[{s_uuid:6301,t_num:2}], skills:{6001:{uuid:6001,lv:1,cd:1.5,ccd:0}},info:"近战,魔法盾 坦克"}, - 5002:{uuid:5002,name:"盾骑士",path:"hk1", fac:FacSet.HERO,cards_lv:3,lv:1,type:HType.Melee,dis:120,hp:150,ap:75,speed:800,atked:[{s_uuid:6301,t_num:2}], + 5002:{uuid:5002,name:"盾骑士",path:"hk1", fac:FacSet.HERO,cards_lv:3,lv:1,type:HType.Melee,dis:720,hp:150,ap:75,speed:800,atked:[{s_uuid:6301,t_num:2}], skills:{6001:{uuid:6001,lv:1,cd:1.5,ccd:0}},info:"近战,群体护盾 坦克"}, - 5003:{uuid:5003,name:"战士3",path:"hk3", fac:FacSet.HERO,cards_lv:2,lv:1,type:HType.Melee,dis:120,hp:100,ap:100,speed:800, + 5003:{uuid:5003,name:"战士3",path:"hk3", fac:FacSet.HERO,cards_lv:2,lv:1,type:HType.Melee,dis:720,hp:100,ap:100,speed:800, skills:{6001:{uuid:6001,lv:1,cd:1.5,ccd:0}},info:"近战,闪击 近战dps"}, - 5004:{uuid:5004,name:"战士4",path:"hk4", fac:FacSet.HERO,cards_lv:4,lv:1,type:HType.Melee,dis:120,hp:100,ap:200,speed:800, + 5004:{uuid:5004,name:"战士4",path:"hk4", fac:FacSet.HERO,cards_lv:4,lv:1,type:HType.Melee,dis:720,hp:100,ap:200,speed:800, skills:{6001:{uuid:6001,lv:1,cd:0.7,ccd:0}},info:"近战,火焰击 近战dps"}, - 5005:{uuid:5005,name:"战士5",path:"hk5", fac:FacSet.HERO,cards_lv:4,lv:1,type:HType.Melee,dis:120,hp:100,ap:200,speed:800, + 5005:{uuid:5005,name:"战士5",path:"hk5", fac:FacSet.HERO,cards_lv:4,lv:1,type:HType.Melee,dis:720,hp:100,ap:200,speed:800, skills:{6001:{uuid:6001,lv:1,cd:1.5,ccd:0}},info:"治疗近战,火焰击 近战dps"},