diff --git a/assets/resources/game/skill/anm/atk/atkc3.anim b/assets/resources/game/skill/anm/atk/atkc3.anim deleted file mode 100644 index 01df5cc4..00000000 --- a/assets/resources/game/skill/anm/atk/atkc3.anim +++ /dev/null @@ -1,140 +0,0 @@ -[ - { - "__type__": "cc.AnimationClip", - "_name": "atkc3", - "_objFlags": 0, - "__editorExtras__": { - "embeddedPlayerGroups": [] - }, - "_native": "", - "sample": 25, - "speed": 1, - "wrapMode": 2, - "enableTrsBlending": false, - "_duration": 0.48, - "_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": "Node" - }, - { - "__type__": "cc.animation.ComponentPath", - "component": "cc.Sprite" - }, - { - "__type__": "cc.animation.Channel", - "_curve": { - "__id__": 6 - } - }, - { - "__type__": "cc.ObjectCurve", - "_times": [ - 0, - 0.04, - 0.08, - 0.12, - 0.16, - 0.2, - 0.24, - 0.28, - 0.32, - 0.36, - 0.4, - 0.44 - ], - "_values": [ - { - "__uuid__": "36b5c30d-a1d9-4bd5-b45e-63b26995d026@3e8ba", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "36b5c30d-a1d9-4bd5-b45e-63b26995d026@6f653", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "36b5c30d-a1d9-4bd5-b45e-63b26995d026@58bf8", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "36b5c30d-a1d9-4bd5-b45e-63b26995d026@c0d46", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "36b5c30d-a1d9-4bd5-b45e-63b26995d026@87cb2", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "36b5c30d-a1d9-4bd5-b45e-63b26995d026@1d17e", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "36b5c30d-a1d9-4bd5-b45e-63b26995d026@39134", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "36b5c30d-a1d9-4bd5-b45e-63b26995d026@2a4c6", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "36b5c30d-a1d9-4bd5-b45e-63b26995d026@eabee", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "36b5c30d-a1d9-4bd5-b45e-63b26995d026@5824c", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "36b5c30d-a1d9-4bd5-b45e-63b26995d026@d8a54", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "36b5c30d-a1d9-4bd5-b45e-63b26995d026@a8c45", - "__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/atkc3.anim.meta b/assets/resources/game/skill/anm/atk/atkc3.anim.meta deleted file mode 100644 index f4f80a92..00000000 --- a/assets/resources/game/skill/anm/atk/atkc3.anim.meta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ver": "2.0.3", - "importer": "animation-clip", - "imported": true, - "uuid": "4575a281-3d4f-49ec-9152-86d59c8ee8ad", - "files": [ - ".cconb" - ], - "subMetas": {}, - "userData": { - "name": "atkc3" - } -} diff --git a/assets/resources/game/skill/atk/atk_c1.prefab b/assets/resources/game/skill/atk/atk_c1.prefab index fc7b7640..cea79111 100644 --- a/assets/resources/game/skill/atk/atk_c1.prefab +++ b/assets/resources/game/skill/atk/atk_c1.prefab @@ -108,8 +108,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -1, - "y": 1, + "x": -0.8, + "y": 0.8, "z": 1 }, "_mobility": 0, diff --git a/assets/resources/game/skill/atk/atk_c2.prefab b/assets/resources/game/skill/atk/atk_c2.prefab index c619bd32..e6549f71 100644 --- a/assets/resources/game/skill/atk/atk_c2.prefab +++ b/assets/resources/game/skill/atk/atk_c2.prefab @@ -108,8 +108,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -1, - "y": 1, + "x": -0.8, + "y": 0.8, "z": 1 }, "_mobility": 0, diff --git a/assets/resources/game/skill/atk/atk_c3.prefab b/assets/resources/game/skill/atk/atk_c3.prefab index d2d1ff21..45a1d75b 100644 --- a/assets/resources/game/skill/atk/atk_c3.prefab +++ b/assets/resources/game/skill/atk/atk_c3.prefab @@ -95,7 +95,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 7.98, + "x": 6.77, "y": 0, "z": 0 }, @@ -108,8 +108,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -1, - "y": 1, + "x": -0.7, + "y": 0.7, "z": 1 }, "_mobility": 0, @@ -136,7 +136,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 91, + "width": 122, "height": 68 }, "_anchorPoint": { @@ -167,13 +167,13 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 0, + "r": 61, "g": 255, - "b": 20, + "b": 0, "a": 255 }, "_spriteFrame": { - "__uuid__": "36b5c30d-a1d9-4bd5-b45e-63b26995d026@3e8ba", + "__uuid__": "36b5c30d-a1d9-4bd5-b45e-63b26995d026@d8028", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -187,7 +187,7 @@ "_fillStart": 0, "_fillRange": 0, "_isTrimmedMode": true, - "_useGrayscale": true, + "_useGrayscale": false, "_atlas": { "__uuid__": "36b5c30d-a1d9-4bd5-b45e-63b26995d026", "__expectedType__": "cc.SpriteAtlas" @@ -254,12 +254,12 @@ "playOnLoad": true, "_clips": [ { - "__uuid__": "4575a281-3d4f-49ec-9152-86d59c8ee8ad", + "__uuid__": "e4ff9dbb-37f1-49d6-b656-b42ceb67f1a7", "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "4575a281-3d4f-49ec-9152-86d59c8ee8ad", + "__uuid__": "e4ff9dbb-37f1-49d6-b656-b42ceb67f1a7", "__expectedType__": "cc.AnimationClip" }, "_id": "" diff --git a/assets/resources/game/skill/atk/atk_c3.prefab.meta b/assets/resources/game/skill/atk/atk_c3.prefab.meta index d4bec8a3..8f610e12 100644 --- a/assets/resources/game/skill/atk/atk_c3.prefab.meta +++ b/assets/resources/game/skill/atk/atk_c3.prefab.meta @@ -2,7 +2,7 @@ "ver": "1.1.50", "importer": "prefab", "imported": true, - "uuid": "74b8d438-4a5f-44bb-a9a4-fab0b839d49b", + "uuid": "f001c311-be1c-4cbf-ac65-61c41cfdd166", "files": [ ".json" ], diff --git a/assets/resources/game/skill/atk/atk_c4.prefab b/assets/resources/game/skill/atk/atk_c4.prefab index 728ba55d..eeee1410 100644 --- a/assets/resources/game/skill/atk/atk_c4.prefab +++ b/assets/resources/game/skill/atk/atk_c4.prefab @@ -95,7 +95,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 7.98, + "x": 6.77, "y": 0, "z": 0 }, @@ -108,8 +108,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -1, - "y": 1, + "x": -0.8, + "y": 0.8, "z": 1 }, "_mobility": 0, @@ -136,7 +136,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 91, + "width": 122, "height": 68 }, "_anchorPoint": { @@ -167,13 +167,13 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 255, + "r": 245, "g": 255, - "b": 8, + "b": 0, "a": 255 }, "_spriteFrame": { - "__uuid__": "36b5c30d-a1d9-4bd5-b45e-63b26995d026@3e8ba", + "__uuid__": "36b5c30d-a1d9-4bd5-b45e-63b26995d026@d8028", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -187,7 +187,7 @@ "_fillStart": 0, "_fillRange": 0, "_isTrimmedMode": true, - "_useGrayscale": true, + "_useGrayscale": false, "_atlas": { "__uuid__": "36b5c30d-a1d9-4bd5-b45e-63b26995d026", "__expectedType__": "cc.SpriteAtlas" @@ -254,12 +254,12 @@ "playOnLoad": true, "_clips": [ { - "__uuid__": "4575a281-3d4f-49ec-9152-86d59c8ee8ad", + "__uuid__": "e4ff9dbb-37f1-49d6-b656-b42ceb67f1a7", "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "4575a281-3d4f-49ec-9152-86d59c8ee8ad", + "__uuid__": "e4ff9dbb-37f1-49d6-b656-b42ceb67f1a7", "__expectedType__": "cc.AnimationClip" }, "_id": "" diff --git a/assets/resources/game/skill/atk/atk_c4.prefab.meta b/assets/resources/game/skill/atk/atk_c4.prefab.meta index 4b58ec3f..de37ce3b 100644 --- a/assets/resources/game/skill/atk/atk_c4.prefab.meta +++ b/assets/resources/game/skill/atk/atk_c4.prefab.meta @@ -2,7 +2,7 @@ "ver": "1.1.50", "importer": "prefab", "imported": true, - "uuid": "1f0633af-d218-4dc6-bc80-2f77af909e64", + "uuid": "7685f842-288f-47d2-82dd-fb92eb82965b", "files": [ ".json" ], diff --git a/assets/resources/game/skill/atk/atk_c5.prefab b/assets/resources/game/skill/atk/atk_c5.prefab index 2302a27b..f3860972 100644 --- a/assets/resources/game/skill/atk/atk_c5.prefab +++ b/assets/resources/game/skill/atk/atk_c5.prefab @@ -95,7 +95,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 7.98, + "x": 6.77, "y": 0, "z": 0 }, @@ -108,8 +108,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -1, - "y": 1, + "x": -0.8, + "y": 0.8, "z": 1 }, "_mobility": 0, @@ -136,7 +136,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 91, + "width": 122, "height": 68 }, "_anchorPoint": { @@ -167,13 +167,13 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, + "r": 250, + "g": 40, + "b": 40, "a": 255 }, "_spriteFrame": { - "__uuid__": "36b5c30d-a1d9-4bd5-b45e-63b26995d026@3e8ba", + "__uuid__": "36b5c30d-a1d9-4bd5-b45e-63b26995d026@d8028", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -254,12 +254,12 @@ "playOnLoad": true, "_clips": [ { - "__uuid__": "4575a281-3d4f-49ec-9152-86d59c8ee8ad", + "__uuid__": "e4ff9dbb-37f1-49d6-b656-b42ceb67f1a7", "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "4575a281-3d4f-49ec-9152-86d59c8ee8ad", + "__uuid__": "e4ff9dbb-37f1-49d6-b656-b42ceb67f1a7", "__expectedType__": "cc.AnimationClip" }, "_id": "" diff --git a/assets/resources/game/skill/atk/atk_c5.prefab.meta b/assets/resources/game/skill/atk/atk_c5.prefab.meta index f9060b60..63d71fc1 100644 --- a/assets/resources/game/skill/atk/atk_c5.prefab.meta +++ b/assets/resources/game/skill/atk/atk_c5.prefab.meta @@ -2,7 +2,7 @@ "ver": "1.1.50", "importer": "prefab", "imported": true, - "uuid": "b7ad767f-ed28-48ac-b352-4d6c34184b34", + "uuid": "d917ca59-8421-4593-9a55-0c59e08ae8fb", "files": [ ".json" ], diff --git a/assets/script/game/common/config/SkillSet.ts b/assets/script/game/common/config/SkillSet.ts index f74a6091..11365a72 100644 --- a/assets/script/game/common/config/SkillSet.ts +++ b/assets/script/game/common/config/SkillSet.ts @@ -209,7 +209,7 @@ export const SkillSet: Record = { * 6010 箭矢黄 击晕取向 **/ 6001: { - uuid: 6001, name: "普通攻击", sp_name: "atk_c5", icon: "1026", TGroup: TGroup.Enemy, readyAnm: "", endAnm: "", act: "atk", + uuid: 6001, name: "普通攻击", sp_name: "atk_c2", 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.linear, EType: EType.collision, info: "造成攻击力100%的伤害", },