From 47509af7a1ddf082fa32e1cfb066f51138851e21 Mon Sep 17 00:00:00 2001 From: walkpan Date: Sat, 1 Nov 2025 09:36:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=80=E8=83=BD=E5=8A=A8=E7=94=BB=E8=B0=83?= =?UTF-8?q?=E8=AF=95=20=E7=BB=A7=E7=BB=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/resources/game/skill/anm/atk01.anim | 140 ++++-- assets/resources/game/skill/atk/atk_s1.prefab | 14 +- assets/resources/game/skill/atk/atk_s2.prefab | 12 +- assets/resources/game/skill/atk/atk_s3.prefab | 410 ------------------ .../game/skill/atk/atk_s3.prefab.meta | 13 - .../resources/game/skill/buff/tooltip.prefab | 6 +- assets/resources/game/skill/end/atked.prefab | 4 +- assets/script/game/hero/HeroViewComp.ts | 6 +- assets/script/game/hero/SACastSystem.ts | 2 +- 9 files changed, 137 insertions(+), 470 deletions(-) delete mode 100644 assets/resources/game/skill/atk/atk_s3.prefab delete mode 100644 assets/resources/game/skill/atk/atk_s3.prefab.meta diff --git a/assets/resources/game/skill/anm/atk01.anim b/assets/resources/game/skill/anm/atk01.anim index cd0050bb..a06b5e38 100644 --- a/assets/resources/game/skill/anm/atk01.anim +++ b/assets/resources/game/skill/anm/atk01.anim @@ -88,7 +88,7 @@ "__type__": "cc.RealCurve", "_times": [ 0, - 0.10000000149011612 + 0.1 ], "_values": [ { @@ -101,7 +101,9 @@ "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": null + "__editorExtras__": { + "broken": null + } }, { "__type__": "cc.RealKeyframeValue", @@ -113,7 +115,9 @@ "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": null + "__editorExtras__": { + "broken": null + } } ], "preExtrapolation": 1, @@ -129,7 +133,7 @@ "__type__": "cc.RealCurve", "_times": [ 0, - 0.10000000149011612 + 0.1 ], "_values": [ { @@ -142,7 +146,9 @@ "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": null + "__editorExtras__": { + "broken": null + } }, { "__type__": "cc.RealKeyframeValue", @@ -154,7 +160,9 @@ "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": null + "__editorExtras__": { + "broken": null + } } ], "preExtrapolation": 1, @@ -170,7 +178,7 @@ "__type__": "cc.RealCurve", "_times": [ 0, - 0.10000000149011612 + 0.1 ], "_values": [ { @@ -183,7 +191,9 @@ "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": null + "__editorExtras__": { + "broken": null + } }, { "__type__": "cc.RealKeyframeValue", @@ -195,7 +205,9 @@ "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": null + "__editorExtras__": { + "broken": null + } } ], "preExtrapolation": 1, @@ -267,8 +279,9 @@ { "__type__": "cc.RealCurve", "_times": [ - 0.06666667014360428, - 0.10000000149011612 + 0, + 0.06666666666666667, + 0.1 ], "_values": [ { @@ -281,7 +294,9 @@ "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": null + "__editorExtras__": { + "broken": null + } }, { "__type__": "cc.RealKeyframeValue", @@ -293,7 +308,23 @@ "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": null + "__editorExtras__": { + "broken": null + } + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 255, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "broken": null + } } ], "preExtrapolation": 1, @@ -308,8 +339,9 @@ { "__type__": "cc.RealCurve", "_times": [ - 0.06666667014360428, - 0.10000000149011612 + 0, + 0.06666666666666667, + 0.1 ], "_values": [ { @@ -322,7 +354,9 @@ "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": null + "__editorExtras__": { + "broken": null + } }, { "__type__": "cc.RealKeyframeValue", @@ -334,7 +368,23 @@ "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": null + "__editorExtras__": { + "broken": null + } + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 255, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "broken": null + } } ], "preExtrapolation": 1, @@ -349,8 +399,9 @@ { "__type__": "cc.RealCurve", "_times": [ - 0.06666667014360428, - 0.10000000149011612 + 0, + 0.06666666666666667, + 0.1 ], "_values": [ { @@ -363,7 +414,9 @@ "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": null + "__editorExtras__": { + "broken": null + } }, { "__type__": "cc.RealKeyframeValue", @@ -375,7 +428,23 @@ "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": null + "__editorExtras__": { + "broken": null + } + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 255, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "broken": null + } } ], "preExtrapolation": 1, @@ -390,21 +459,38 @@ { "__type__": "cc.RealCurve", "_times": [ - 0.06666667014360428, - 0.10000000149011612 + 0, + 0.06666666666666667, + 0.1 ], "_values": [ { "__type__": "cc.RealKeyframeValue", "interpolationMode": 0, "tangentWeightMode": 0, - "value": 255, + "value": 146, "rightTangent": 0, "rightTangentWeight": 1, "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": null + "__editorExtras__": { + "broken": null + } + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 59, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "broken": null + } }, { "__type__": "cc.RealKeyframeValue", @@ -416,7 +502,9 @@ "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": null + "__editorExtras__": { + "broken": null + } } ], "preExtrapolation": 1, diff --git a/assets/resources/game/skill/atk/atk_s1.prefab b/assets/resources/game/skill/atk/atk_s1.prefab index e45ca5bf..bac84beb 100644 --- a/assets/resources/game/skill/atk/atk_s1.prefab +++ b/assets/resources/game/skill/atk/atk_s1.prefab @@ -139,13 +139,13 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 56.666667, - "height": 104 + "width": 60, + "height": 60 }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 0, - "y": 0 + "x": 0.2, + "y": 0.2 }, "_id": "" }, @@ -173,10 +173,10 @@ "r": 255, "g": 255, "b": 255, - "a": 255 + "a": 119 }, "_spriteFrame": { - "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@01a00", + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@97355", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -278,6 +278,8 @@ "__id__": 0 }, "fileId": "3arqAMBz1MvoXBzeDaL5M/", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { diff --git a/assets/resources/game/skill/atk/atk_s2.prefab b/assets/resources/game/skill/atk/atk_s2.prefab index 273ccb04..6ba52cc5 100644 --- a/assets/resources/game/skill/atk/atk_s2.prefab +++ b/assets/resources/game/skill/atk/atk_s2.prefab @@ -139,13 +139,13 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 53.5, - "height": 98 + "width": 60, + "height": 60 }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 0, - "y": 0 + "x": 0.2, + "y": 0.2 }, "_id": "" }, @@ -173,10 +173,10 @@ "r": 255, "g": 255, "b": 255, - "a": 255 + "a": 170 }, "_spriteFrame": { - "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@8e2cc", + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@a99aa", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, diff --git a/assets/resources/game/skill/atk/atk_s3.prefab b/assets/resources/game/skill/atk/atk_s3.prefab deleted file mode 100644 index c75ab494..00000000 --- a/assets/resources/game/skill/atk/atk_s3.prefab +++ /dev/null @@ -1,410 +0,0 @@ -[ - { - "__type__": "cc.Prefab", - "_name": "atk_s3", - "_objFlags": 0, - "__editorExtras__": {}, - "_native": "", - "data": { - "__id__": 1 - }, - "optimizationPolicy": 0, - "persistent": false - }, - { - "__type__": "cc.Node", - "_name": "atk_s3", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": null, - "_children": [ - { - "__id__": 2 - } - ], - "_active": true, - "_components": [ - { - "__id__": 12 - }, - { - "__id__": 14 - }, - { - "__id__": 16 - }, - { - "__id__": 18 - } - ], - "_prefab": { - "__id__": 20 - }, - "_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.Node", - "_name": "Node", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 3 - }, - { - "__id__": 5 - }, - { - "__id__": 7 - }, - { - "__id__": 9 - } - ], - "_prefab": { - "__id__": 11 - }, - "_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__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 4 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 53.5, - "height": 98 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "93pNmvtQlLSqtTgIepyEmA" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 6 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@8e2cc", - "__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": { - "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23", - "__expectedType__": "cc.SpriteAtlas" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "12eKc8gltBz50frJCS5+ww" - }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 8 - }, - "enabledContactListener": false, - "bullet": false, - "awakeOnLoad": true, - "_group": 1, - "_type": 2, - "_allowSleep": true, - "_gravityScale": 1, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "98cPYmJhNA4J/GZdhUWQGv" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 10 - }, - "tag": 0, - "_group": 1, - "_density": 1, - "_sensor": false, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 43.5, - "y": 48.5 - }, - "_size": { - "__type__": "cc.Size", - "width": 87, - "height": 97 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "63V4BzNKRDzYi3gYIKcuRs" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "3arqAMBz1MvoXBzeDaL5M/", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 13 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 240, - "height": 100 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "63NP9yq3hEUKD/OZZZ5t7x" - }, - { - "__type__": "cc.Animation", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 15 - }, - "playOnLoad": true, - "_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": "c2RDvksalG2acL3tyGCY0t" - }, - { - "__type__": "57aabs7TE1J5obTAZczc+64", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 17 - }, - "atk_x": 0, - "atk_y": 0, - "runType": 2, - "endType": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "60LInmZXxDtKu79AshRG9j" - }, - { - "__type__": "f680dkagx9PmbfqtF463/Ua", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 19 - }, - "speed": 600, - "controlPointSide": 1, - "controlPointOffset": 0.5, - "controlPointRandomness": 0.3, - "autoRotate": false, - "showTrajectory": false, - "trajectoryColor": { - "__type__": "cc.Color", - "r": 0, - "g": 255, - "b": 0, - "a": 255 - }, - "trajectoryWidth": 3, - "easing": "linear", - "rotationSmoothness": 0.6, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "65YLwe9t9EXo5kI3HQEGhs" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", - "instance": null, - "targetOverrides": null - } -] \ No newline at end of file diff --git a/assets/resources/game/skill/atk/atk_s3.prefab.meta b/assets/resources/game/skill/atk/atk_s3.prefab.meta deleted file mode 100644 index 77ba94b5..00000000 --- a/assets/resources/game/skill/atk/atk_s3.prefab.meta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ver": "1.1.50", - "importer": "prefab", - "imported": true, - "uuid": "940ebade-65c5-4af0-b3ef-99b339fb81d1", - "files": [ - ".json" - ], - "subMetas": {}, - "userData": { - "syncNodeName": "atk_s3" - } -} diff --git a/assets/resources/game/skill/buff/tooltip.prefab b/assets/resources/game/skill/buff/tooltip.prefab index 3d97aa42..90a4a861 100644 --- a/assets/resources/game/skill/buff/tooltip.prefab +++ b/assets/resources/game/skill/buff/tooltip.prefab @@ -112,7 +112,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 20, + "y": 100, "z": 0 }, "_lrot": { @@ -571,7 +571,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 20, + "y": 100, "z": 0 }, "_lrot": { @@ -1030,7 +1030,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 20, + "y": 100, "z": 0 }, "_lrot": { diff --git a/assets/resources/game/skill/end/atked.prefab b/assets/resources/game/skill/end/atked.prefab index 8bae31da..e84c6cad 100644 --- a/assets/resources/game/skill/end/atked.prefab +++ b/assets/resources/game/skill/end/atked.prefab @@ -102,8 +102,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.7, - "y": 0.7, + "x": 0.4, + "y": 0.4, "z": 1 }, "_mobility": 0, diff --git a/assets/script/game/hero/HeroViewComp.ts b/assets/script/game/hero/HeroViewComp.ts index ce1c42bd..928a3e32 100644 --- a/assets/script/game/hero/HeroViewComp.ts +++ b/assets/script/game/hero/HeroViewComp.ts @@ -175,7 +175,7 @@ export class HeroViewComp extends CCComp { var prefab: Prefab = oops.res.get(path, Prefab)!; var node = instantiate(prefab); node.setScale(node.scale.x * scale, node.scale.y); - node.setPosition(this.node.position.x, this.node.position.y + 30, this.node.position.z); + node.setPosition(this.node.position.x, this.node.position.y+8, this.node.position.z); node.parent = this.node.parent; } @@ -204,7 +204,7 @@ export class HeroViewComp extends CCComp { /** 技能提示 */ private tooltip(type: number = 1, value: string = "", s_uuid: number = 1001, y: number = 90) { let tip = ecs.getEntity(Tooltip); - let pos = v3(0, 10); + let pos = v3(0, 60); pos.y = pos.y + y; tip.load(pos, type, value, s_uuid, this.node); } @@ -213,7 +213,7 @@ export class HeroViewComp extends CCComp { private hp_tip(type: number = 1, value: string = "", s_uuid: number = 1001, y: number = 90) { let tip = ecs.getEntity(Tooltip); let x = this.node.position.x; - let ny = this.node.getComponent(UITransform).height + 20; + let ny = this.node.getComponent(UITransform).height + 60; let pos = v3(x, ny, 0); tip.load(pos, type, value, s_uuid, this.node.parent); } diff --git a/assets/script/game/hero/SACastSystem.ts b/assets/script/game/hero/SACastSystem.ts index 626bf053..07651a00 100644 --- a/assets/script/game/hero/SACastSystem.ts +++ b/assets/script/game/hero/SACastSystem.ts @@ -109,7 +109,7 @@ export class SACastSystem extends ecs.ComblockSystem implements ecs.ISystemUpdat heroView.playSkillEffect(s_uuid); // 2. 延迟创建技能实体（等待动画） - const delay = 0.1 + const delay = 0.3 heroView.scheduleOnce(() => { this.createSkill(s_uuid, heroView); }, delay);