diff --git a/assets/resources/game/skill/anm/atk_arrow_blue.anim b/assets/resources/game/skill/anm/atk_arrow_blue.anim new file mode 100644 index 00000000..c1bd3273 --- /dev/null +++ b/assets/resources/game/skill/anm/atk_arrow_blue.anim @@ -0,0 +1,100 @@ +[ + { + "__type__": "cc.AnimationClip", + "_name": "atk_arrow_blue", + "_objFlags": 0, + "__editorExtras__": { + "embeddedPlayerGroups": [] + }, + "_native": "", + "sample": 24, + "speed": 1, + "wrapMode": 2, + "enableTrsBlending": false, + "_duration": 0.16666666666666666, + "_hash": 500763545, + "_tracks": [ + { + "__id__": 1 + } + ], + "_exoticAnimation": null, + "_events": [], + "_embeddedPlayers": [], + "_additiveSettings": { + "__id__": 7 + }, + "_auxiliaryCurveEntries": [] + }, + { + "__type__": "cc.animation.ObjectTrack", + "_binding": { + "__type__": "cc.animation.TrackBinding", + "path": { + "__id__": 2 + }, + "proxy": null + }, + "_channel": { + "__id__": 5 + } + }, + { + "__type__": "cc.animation.TrackPath", + "_paths": [ + { + "__id__": 3 + }, + { + "__id__": 4 + }, + "spriteFrame" + ] + }, + { + "__type__": "cc.animation.HierarchyPath", + "path": "E" + }, + { + "__type__": "cc.animation.ComponentPath", + "component": "cc.Sprite" + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 6 + } + }, + { + "__type__": "cc.ObjectCurve", + "_times": [ + 0, + 0.041666666666666664, + 0.08333333333333333, + 0.125 + ], + "_values": [ + { + "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@a4e22", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@2b0ce", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@29738", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@faf10", + "__expectedType__": "cc.SpriteFrame" + } + ] + }, + { + "__type__": "cc.AnimationClipAdditiveSettings", + "enabled": false, + "refClip": null + } +] \ No newline at end of file diff --git a/assets/resources/game/skill/anm/atk_arrow_blue.anim.meta b/assets/resources/game/skill/anm/atk_arrow_blue.anim.meta new file mode 100644 index 00000000..ceb3a3cb --- /dev/null +++ b/assets/resources/game/skill/anm/atk_arrow_blue.anim.meta @@ -0,0 +1,13 @@ +{ + "ver": "2.0.3", + "importer": "animation-clip", + "imported": true, + "uuid": "a6568e30-fa37-4afc-990f-34caeafc39b6", + "files": [ + ".cconb" + ], + "subMetas": {}, + "userData": { + "name": "atk_arrow_blue" + } +} diff --git a/assets/resources/game/skill/atk/atk_s1.prefab b/assets/resources/game/skill/atk/atk_s1.prefab index 07f48cba..978533da 100644 --- a/assets/resources/game/skill/atk/atk_s1.prefab +++ b/assets/resources/game/skill/atk/atk_s1.prefab @@ -164,7 +164,7 @@ "node": { "__id__": 2 }, - "_enabled": false, + "_enabled": true, "__prefab": { "__id__": 6 }, @@ -178,10 +178,7 @@ "b": 255, "a": 119 }, - "_spriteFrame": { - "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@97355", - "__expectedType__": "cc.SpriteFrame" - }, + "_spriteFrame": null, "_type": 0, "_fillType": 0, "_sizeMode": 0, @@ -346,7 +343,6 @@ "__type__": "57aabs7TE1J5obTAZczc+64", "_name": "", "_objFlags": 0, - "__editorExtras__": {}, "node": { "__id__": 1 }, diff --git a/assets/resources/game/skill/atk/atk_s2.prefab b/assets/resources/game/skill/atk/atk_s2.prefab index bee59dc6..799c1ec1 100644 --- a/assets/resources/game/skill/atk/atk_s2.prefab +++ b/assets/resources/game/skill/atk/atk_s2.prefab @@ -158,7 +158,7 @@ "node": { "__id__": 2 }, - "_enabled": false, + "_enabled": true, "__prefab": { "__id__": 6 }, @@ -172,10 +172,7 @@ "b": 255, "a": 170 }, - "_spriteFrame": { - "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@a99aa", - "__expectedType__": "cc.SpriteFrame" - }, + "_spriteFrame": null, "_type": 0, "_fillType": 0, "_sizeMode": 0, @@ -340,7 +337,6 @@ "__type__": "57aabs7TE1J5obTAZczc+64", "_name": "", "_objFlags": 0, - "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -350,7 +346,7 @@ }, "atk_x": 0, "atk_y": 0, - "_id": "" + "_id": "a1y6MJDfVD1o+ESVz7sAtv" }, { "__type__": "cc.CompPrefabInfo", diff --git a/assets/resources/game/skill/atk/b_arrow_1.prefab b/assets/resources/game/skill/atk/b_arrow_1.prefab index 0191357c..7b72d84c 100644 --- a/assets/resources/game/skill/atk/b_arrow_1.prefab +++ b/assets/resources/game/skill/atk/b_arrow_1.prefab @@ -20,19 +20,13 @@ "_children": [ { "__id__": 2 + }, + { + "__id__": 8 } ], "_active": true, "_components": [ - { - "__id__": 8 - }, - { - "__id__": 10 - }, - { - "__id__": 12 - }, { "__id__": 14 }, @@ -41,10 +35,19 @@ }, { "__id__": 18 + }, + { + "__id__": 20 + }, + { + "__id__": 22 + }, + { + "__id__": 24 } ], "_prefab": { - "__id__": 20 + "__id__": 26 }, "_lpos": { "__type__": "cc.Vec3", @@ -77,7 +80,7 @@ }, { "__type__": "cc.Node", - "_name": "Node", + "_name": "E", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -98,8 +101,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, - "y": 0, + "x": -16.397, + "y": 0.755, "z": 0 }, "_lrot": { @@ -139,19 +142,19 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 60, - "height": 60 + "width": 74, + "height": 64 }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 0.2, - "y": 0.2 + "x": 0.5, + "y": 0.5 }, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "93pNmvtQlLSqtTgIepyEmA" + "fileId": "06BuaYuTlH7oarNLUv4Quo" }, { "__type__": "cc.Sprite", @@ -168,6 +171,142 @@ "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@a4e22", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "54o3uGyUNODo0HOzGkYqsA" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "5563D/YVpGlqqIyYnHSEwW", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "Node", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 9 + }, + { + "__id__": 11 + } + ], + "_prefab": { + "__id__": 13 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 8 + }, + "_enabled": true, + "__prefab": { + "__id__": 10 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 40, + "height": 6 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "93pNmvtQlLSqtTgIepyEmA" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 8 + }, + "_enabled": true, + "__prefab": { + "__id__": 12 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", "r": 255, @@ -175,8 +314,11 @@ "b": 255, "a": 170 }, - "_spriteFrame": null, - "_type": 0, + "_spriteFrame": { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@0ab4e", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, "_fillType": 0, "_sizeMode": 0, "_fillCenter": { @@ -221,17 +363,17 @@ }, "_enabled": true, "__prefab": { - "__id__": 9 + "__id__": 15 }, "_contentSize": { "__type__": "cc.Size", - "width": 240, - "height": 100 + "width": 40, + "height": 10 }, "_anchorPoint": { "__type__": "cc.Vec2", "x": 0.5, - "y": 0 + "y": 0.5 }, "_id": "" }, @@ -249,13 +391,19 @@ }, "_enabled": true, "__prefab": { - "__id__": 11 + "__id__": 17 }, "playOnLoad": true, "_clips": [ - null + { + "__uuid__": "a6568e30-fa37-4afc-990f-34caeafc39b6", + "__expectedType__": "cc.AnimationClip" + } ], - "_defaultClip": null, + "_defaultClip": { + "__uuid__": "a6568e30-fa37-4afc-990f-34caeafc39b6", + "__expectedType__": "cc.AnimationClip" + }, "_id": "" }, { @@ -266,13 +414,12 @@ "__type__": "57aabs7TE1J5obTAZczc+64", "_name": "", "_objFlags": 0, - "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, "__prefab": { - "__id__": 13 + "__id__": 19 }, "atk_x": 0, "atk_y": 0, @@ -292,7 +439,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 21 }, "speed": 600, "controlPointSide": 1, @@ -326,7 +473,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 23 }, "enabledContactListener": true, "bullet": false, @@ -360,7 +507,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 25 }, "tag": 0, "_group": 1, @@ -370,13 +517,13 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": 43.5, - "y": 48.5 + "x": 0, + "y": 0 }, "_size": { "__type__": "cc.Size", - "width": 87, - "height": 97 + "width": 40, + "height": 10 }, "_id": "" }, diff --git a/assets/resources/game/skill/skill2.plist.meta b/assets/resources/game/skill/skill2.plist.meta index 59eebddf..c987e170 100644 --- a/assets/resources/game/skill/skill2.plist.meta +++ b/assets/resources/game/skill/skill2.plist.meta @@ -1314,8 +1314,8 @@ "rawHeight": 48, "borderTop": 0, "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, + "borderLeft": 80, + "borderRight": 79, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5,