From 1855bcec4c2c984319456f7bd2154139ef7d6f88 Mon Sep 17 00:00:00 2001 From: pan Date: Thu, 4 Jun 2026 10:43:53 +0800 Subject: [PATCH] feat(card skill): add skill parameter override support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 新增卡牌技能参数覆写配置项，支持自定义伤害、buff数值等 2. 调整UI布局的上下边框参数，适配技能框显示 3. 完整打通技能覆写参数从配置到技能释放的全链路 --- assets/resources/gui/aui.plist.meta | 4 +- assets/resources/gui/element/MSkillBox.prefab | 1380 +++++++++++++---- assets/script/game/common/config/CardSet.ts | 2 + assets/script/game/hero/SCastSystem.ts | 13 +- assets/script/game/map/SkillBoxComp.ts | 8 +- 5 files changed, 1115 insertions(+), 292 deletions(-) diff --git a/assets/resources/gui/aui.plist.meta b/assets/resources/gui/aui.plist.meta index 5008348b..4913a698 100644 --- a/assets/resources/gui/aui.plist.meta +++ b/assets/resources/gui/aui.plist.meta @@ -2692,8 +2692,8 @@ "height": 81, "rawWidth": 185, "rawHeight": 81, - "borderTop": 0, - "borderBottom": 0, + "borderTop": 40, + "borderBottom": 35, "borderLeft": 92, "borderRight": 92, "packable": true, diff --git a/assets/resources/gui/element/MSkillBox.prefab b/assets/resources/gui/element/MSkillBox.prefab index a298a1ac..17311c08 100644 --- a/assets/resources/gui/element/MSkillBox.prefab +++ b/assets/resources/gui/element/MSkillBox.prefab @@ -25,23 +25,26 @@ "__id__": 10 }, { - "__id__": 131 + "__id__": 24 + }, + { + "__id__": 187 } ], "_active": true, "_components": [ { - "__id__": 175 + "__id__": 231 }, { - "__id__": 177 + "__id__": 233 }, { - "__id__": 179 + "__id__": 235 } ], "_prefab": { - "__id__": 181 + "__id__": 237 }, "_lpos": { "__type__": "cc.Vec3", @@ -252,7 +255,7 @@ }, { "__type__": "cc.Node", - "_name": "cards", + "_name": "bg2", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -261,36 +264,342 @@ "_children": [ { "__id__": 11 - }, - { - "__id__": 48 - }, - { - "__id__": 85 } ], "_active": true, "_components": [ { - "__id__": 122 + "__id__": 19 }, { - "__id__": 124 - }, - { - "__id__": 126 - }, - { - "__id__": 128 + "__id__": 21 } ], "_prefab": { - "__id__": 130 + "__id__": 23 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -150, + "y": -40, + "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": "btn_sky", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 10 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 12 + }, + { + "__id__": 14 + }, + { + "__id__": 16 + } + ], + "_prefab": { + "__id__": 18 + }, + "_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__": 11 + }, + "_enabled": true, + "__prefab": { + "__id__": 13 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 700.0000000000006, + "height": 600 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "08WRaUTRtBoLZDLT2cN4Mc" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 11 + }, + "_enabled": true, + "__prefab": { + "__id__": 15 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@e9165", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_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": "03RfLB07VFR5uklShb2x26" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 11 + }, + "_enabled": true, + "__prefab": { + "__id__": 17 + }, + "_alignFlags": 45, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 185, + "_originalHeight": 81, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a3cPcPwhJD0b1a42pOaLxy" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "70TAIG6KROq7YtmAV7TB6O", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 10 + }, + "_enabled": true, + "__prefab": { + "__id__": 20 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 700.0000000000006, + "height": 600 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "efn7IzyGtCJIFV50y3xcMm" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 10 + }, + "_enabled": true, + "__prefab": { + "__id__": 22 + }, + "_alignFlags": 44, + "_target": null, + "_left": 10, + "_right": 10, + "_top": 590, + "_bottom": 300, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 100, + "_originalHeight": 100, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "fc2EpaVB1BrppLfezSkGbe" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "a7x2ngYBBCDZGBGSnpC09G", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "cards", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 25 + }, + { + "__id__": 76 + }, + { + "__id__": 127 + } + ], + "_active": true, + "_components": [ + { + "__id__": 178 + }, + { + "__id__": 180 + }, + { + "__id__": 182 + }, + { + "__id__": 184 + } + ], + "_prefab": { + "__id__": 186 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -147.457, "z": 0 }, "_lrot": { @@ -320,17 +629,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 10 + "__id__": 24 }, "_prefab": { - "__id__": 12 + "__id__": 26 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 11 + "__id__": 25 }, "asset": { "__uuid__": "8aaff904-8c27-4173-9716-7161893b336e", @@ -338,7 +647,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 13 + "__id__": 27 }, "targetOverrides": null }, @@ -351,31 +660,10 @@ "mountedChildren": [], "mountedComponents": [ { - "__id__": 14 + "__id__": 28 } ], "propertyOverrides": [ - { - "__id__": 18 - }, - { - "__id__": 20 - }, - { - "__id__": 22 - }, - { - "__id__": 24 - }, - { - "__id__": 26 - }, - { - "__id__": 28 - }, - { - "__id__": 30 - }, { "__id__": 32 }, @@ -399,6 +687,48 @@ }, { "__id__": 46 + }, + { + "__id__": 48 + }, + { + "__id__": 50 + }, + { + "__id__": 52 + }, + { + "__id__": 54 + }, + { + "__id__": 56 + }, + { + "__id__": 58 + }, + { + "__id__": 60 + }, + { + "__id__": 62 + }, + { + "__id__": 64 + }, + { + "__id__": 66 + }, + { + "__id__": 68 + }, + { + "__id__": 70 + }, + { + "__id__": 72 + }, + { + "__id__": 74 } ], "removedComponents": [] @@ -406,11 +736,11 @@ { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 15 + "__id__": 29 }, "components": [ { - "__id__": 16 + "__id__": 30 } ] }, @@ -426,15 +756,15 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 11 + "__id__": 25 } }, "node": { - "__id__": 11 + "__id__": 25 }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 31 }, "_alignFlags": 8, "_target": null, @@ -463,7 +793,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 19 + "__id__": 33 }, "propertyPath": [ "_name" @@ -479,7 +809,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 21 + "__id__": 35 }, "propertyPath": [ "_lpos" @@ -500,7 +830,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 23 + "__id__": 37 }, "propertyPath": [ "_lrot" @@ -522,7 +852,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 25 + "__id__": 39 }, "propertyPath": [ "_euler" @@ -543,7 +873,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 27 + "__id__": 41 }, "propertyPath": [ "_active" @@ -559,7 +889,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 29 + "__id__": 43 }, "propertyPath": [ "_contentSize" @@ -579,7 +909,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 31 + "__id__": 45 }, "propertyPath": [ "_contentSize" @@ -587,7 +917,7 @@ "value": { "__type__": "cc.Size", "width": 210, - "height": 270 + "height": 320 } }, { @@ -599,7 +929,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 33 + "__id__": 47 }, "propertyPath": [ "_lpos" @@ -607,7 +937,7 @@ "value": { "__type__": "cc.Vec3", "x": 84, - "y": 114, + "y": 139, "z": 0 } }, @@ -620,7 +950,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 35 + "__id__": 49 }, "propertyPath": [ "_lpos" @@ -628,7 +958,7 @@ "value": { "__type__": "cc.Vec3", "x": -84, - "y": 114, + "y": 139, "z": 0 } }, @@ -641,7 +971,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 37 + "__id__": 51 }, "propertyPath": [ "_contentSize" @@ -649,7 +979,7 @@ "value": { "__type__": "cc.Size", "width": 210, - "height": 270 + "height": 320 } }, { @@ -661,7 +991,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 53 }, "propertyPath": [ "_lpos" @@ -669,7 +999,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": 50, + "y": 75, "z": 0 } }, @@ -682,7 +1012,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 41 + "__id__": 55 }, "propertyPath": [ "_lpos" @@ -690,7 +1020,7 @@ "value": { "__type__": "cc.Vec3", "x": -61.79599999999999, - "y": -114.26499999999999, + "y": -139.265, "z": 0 } }, @@ -703,7 +1033,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 43 + "__id__": 57 }, "propertyPath": [ "_lpos" @@ -711,7 +1041,7 @@ "value": { "__type__": "cc.Vec3", "x": 60.925, - "y": -114.26499999999999, + "y": -139.265, "z": 0 } }, @@ -724,7 +1054,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 45 + "__id__": 59 }, "propertyPath": [ "_lpos" @@ -732,7 +1062,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": -41.72399999999999, + "y": -16.72399999999999, "z": 0 } }, @@ -745,7 +1075,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 47 + "__id__": 61 }, "propertyPath": [ "_contentSize" @@ -762,21 +1092,169 @@ "aePszddr1FjZ9yJvRxiJCh" ] }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 63 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 210, + "height": 320 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "fbT2L4/5lBv6CDydZR8SkP", + "13j2oupQRMUoUyChWYn2yc" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 65 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 210, + "height": 320 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "fbT2L4/5lBv6CDydZR8SkP", + "c8mzU+nw5GLJ4CZ7ZTe6eE" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 67 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 420, + "height": 640 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "fbT2L4/5lBv6CDydZR8SkP", + "5eZRKQByFG0LW2QA/PUw2u" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 69 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 412, + "height": 628 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "fbT2L4/5lBv6CDydZR8SkP", + "4buoN7nzRM9Kty43yoN7ul" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 71 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 180, + "height": 140 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "fbT2L4/5lBv6CDydZR8SkP", + "faGw1NMRpJ+IWtI609CAxN" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 73 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 360, + "height": 280 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "fbT2L4/5lBv6CDydZR8SkP", + "5cf2X5S4JMQ7x3zijgLWIX" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 75 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 75, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "fbT2L4/5lBv6CDydZR8SkP", + "69ZX4yvCZL67xK4+SdFMO0" + ] + }, { "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 10 + "__id__": 24 }, "_prefab": { - "__id__": 49 + "__id__": 77 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 48 + "__id__": 76 }, "asset": { "__uuid__": "8aaff904-8c27-4173-9716-7161893b336e", @@ -784,7 +1262,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 50 + "__id__": 78 }, "targetOverrides": null }, @@ -797,54 +1275,75 @@ "mountedChildren": [], "mountedComponents": [ { - "__id__": 51 + "__id__": 79 } ], "propertyOverrides": [ - { - "__id__": 55 - }, - { - "__id__": 57 - }, - { - "__id__": 59 - }, - { - "__id__": 61 - }, - { - "__id__": 63 - }, - { - "__id__": 65 - }, - { - "__id__": 67 - }, - { - "__id__": 69 - }, - { - "__id__": 71 - }, - { - "__id__": 73 - }, - { - "__id__": 75 - }, - { - "__id__": 77 - }, - { - "__id__": 79 - }, - { - "__id__": 81 - }, { "__id__": 83 + }, + { + "__id__": 85 + }, + { + "__id__": 87 + }, + { + "__id__": 89 + }, + { + "__id__": 91 + }, + { + "__id__": 93 + }, + { + "__id__": 95 + }, + { + "__id__": 97 + }, + { + "__id__": 99 + }, + { + "__id__": 101 + }, + { + "__id__": 103 + }, + { + "__id__": 105 + }, + { + "__id__": 107 + }, + { + "__id__": 109 + }, + { + "__id__": 111 + }, + { + "__id__": 113 + }, + { + "__id__": 115 + }, + { + "__id__": 117 + }, + { + "__id__": 119 + }, + { + "__id__": 121 + }, + { + "__id__": 123 + }, + { + "__id__": 125 } ], "removedComponents": [] @@ -852,11 +1351,11 @@ { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 52 + "__id__": 80 }, "components": [ { - "__id__": 53 + "__id__": 81 } ] }, @@ -872,15 +1371,15 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 48 + "__id__": 76 } }, "node": { - "__id__": 48 + "__id__": 76 }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 82 }, "_alignFlags": 16, "_target": null, @@ -909,7 +1408,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 56 + "__id__": 84 }, "propertyPath": [ "_name" @@ -925,7 +1424,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 58 + "__id__": 86 }, "propertyPath": [ "_lpos" @@ -946,7 +1445,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 60 + "__id__": 88 }, "propertyPath": [ "_lrot" @@ -968,7 +1467,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 62 + "__id__": 90 }, "propertyPath": [ "_euler" @@ -989,7 +1488,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 64 + "__id__": 92 }, "propertyPath": [ "_active" @@ -1005,7 +1504,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 66 + "__id__": 94 }, "propertyPath": [ "_contentSize" @@ -1025,7 +1524,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 68 + "__id__": 96 }, "propertyPath": [ "_contentSize" @@ -1033,7 +1532,7 @@ "value": { "__type__": "cc.Size", "width": 210, - "height": 270 + "height": 320 } }, { @@ -1045,15 +1544,15 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 70 + "__id__": 98 }, "propertyPath": [ "_lpos" ], "value": { "__type__": "cc.Vec3", - "x": 43.28199999999998, - "y": 113.357, + "x": 84, + "y": 139, "z": 0 } }, @@ -1066,15 +1565,15 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 72 + "__id__": 100 }, "propertyPath": [ "_lpos" ], "value": { "__type__": "cc.Vec3", - "x": -42.61099999999999, - "y": 114.03800000000001, + "x": -84, + "y": 139, "z": 0 } }, @@ -1087,7 +1586,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 102 }, "propertyPath": [ "_contentSize" @@ -1095,7 +1594,7 @@ "value": { "__type__": "cc.Size", "width": 210, - "height": 270 + "height": 320 } }, { @@ -1107,7 +1606,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 76 + "__id__": 104 }, "propertyPath": [ "_lpos" @@ -1115,7 +1614,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": 50, + "y": 75, "z": 0 } }, @@ -1128,7 +1627,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 78 + "__id__": 106 }, "propertyPath": [ "_lpos" @@ -1136,7 +1635,7 @@ "value": { "__type__": "cc.Vec3", "x": -61.79599999999999, - "y": -114.26499999999999, + "y": -139.265, "z": 0 } }, @@ -1149,7 +1648,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 108 }, "propertyPath": [ "_lpos" @@ -1157,7 +1656,7 @@ "value": { "__type__": "cc.Vec3", "x": 60.925, - "y": -114.26499999999999, + "y": -139.265, "z": 0 } }, @@ -1170,7 +1669,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 82 + "__id__": 110 }, "propertyPath": [ "_lpos" @@ -1178,7 +1677,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": -41.72399999999999, + "y": -16.72399999999999, "z": 0 } }, @@ -1191,7 +1690,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 84 + "__id__": 112 }, "propertyPath": [ "_contentSize" @@ -1208,21 +1707,169 @@ "aePszddr1FjZ9yJvRxiJCh" ] }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 114 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 210, + "height": 320 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "fbT2L4/5lBv6CDydZR8SkP", + "13j2oupQRMUoUyChWYn2yc" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 116 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 210, + "height": 320 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "fbT2L4/5lBv6CDydZR8SkP", + "c8mzU+nw5GLJ4CZ7ZTe6eE" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 118 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 420, + "height": 640 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "fbT2L4/5lBv6CDydZR8SkP", + "5eZRKQByFG0LW2QA/PUw2u" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 120 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 412, + "height": 628 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "fbT2L4/5lBv6CDydZR8SkP", + "4buoN7nzRM9Kty43yoN7ul" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 122 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 180, + "height": 140 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "fbT2L4/5lBv6CDydZR8SkP", + "faGw1NMRpJ+IWtI609CAxN" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 124 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 360, + "height": 280 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "fbT2L4/5lBv6CDydZR8SkP", + "5cf2X5S4JMQ7x3zijgLWIX" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 126 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 75, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "fbT2L4/5lBv6CDydZR8SkP", + "69ZX4yvCZL67xK4+SdFMO0" + ] + }, { "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 10 + "__id__": 24 }, "_prefab": { - "__id__": 86 + "__id__": 128 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 85 + "__id__": 127 }, "asset": { "__uuid__": "8aaff904-8c27-4173-9716-7161893b336e", @@ -1230,7 +1877,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 87 + "__id__": 129 }, "targetOverrides": null }, @@ -1243,54 +1890,75 @@ "mountedChildren": [], "mountedComponents": [ { - "__id__": 88 + "__id__": 130 } ], "propertyOverrides": [ { - "__id__": 92 + "__id__": 134 }, { - "__id__": 94 + "__id__": 136 }, { - "__id__": 96 + "__id__": 138 }, { - "__id__": 98 + "__id__": 140 }, { - "__id__": 100 + "__id__": 142 }, { - "__id__": 102 + "__id__": 144 }, { - "__id__": 104 + "__id__": 146 }, { - "__id__": 106 + "__id__": 148 }, { - "__id__": 108 + "__id__": 150 }, { - "__id__": 110 + "__id__": 152 }, { - "__id__": 112 + "__id__": 154 }, { - "__id__": 114 + "__id__": 156 }, { - "__id__": 116 + "__id__": 158 }, { - "__id__": 118 + "__id__": 160 }, { - "__id__": 120 + "__id__": 162 + }, + { + "__id__": 164 + }, + { + "__id__": 166 + }, + { + "__id__": 168 + }, + { + "__id__": 170 + }, + { + "__id__": 172 + }, + { + "__id__": 174 + }, + { + "__id__": 176 } ], "removedComponents": [] @@ -1298,11 +1966,11 @@ { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 89 + "__id__": 131 }, "components": [ { - "__id__": 90 + "__id__": 132 } ] }, @@ -1318,15 +1986,15 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 85 + "__id__": 127 } }, "node": { - "__id__": 85 + "__id__": 127 }, "_enabled": true, "__prefab": { - "__id__": 91 + "__id__": 133 }, "_alignFlags": 32, "_target": null, @@ -1355,7 +2023,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 93 + "__id__": 135 }, "propertyPath": [ "_name" @@ -1371,7 +2039,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 95 + "__id__": 137 }, "propertyPath": [ "_lpos" @@ -1392,7 +2060,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 97 + "__id__": 139 }, "propertyPath": [ "_lrot" @@ -1414,7 +2082,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 99 + "__id__": 141 }, "propertyPath": [ "_euler" @@ -1435,7 +2103,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 101 + "__id__": 143 }, "propertyPath": [ "_active" @@ -1451,7 +2119,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 103 + "__id__": 145 }, "propertyPath": [ "_contentSize" @@ -1471,7 +2139,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 105 + "__id__": 147 }, "propertyPath": [ "_contentSize" @@ -1479,7 +2147,7 @@ "value": { "__type__": "cc.Size", "width": 210, - "height": 270 + "height": 320 } }, { @@ -1491,7 +2159,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 107 + "__id__": 149 }, "propertyPath": [ "_contentSize" @@ -1499,7 +2167,7 @@ "value": { "__type__": "cc.Size", "width": 210, - "height": 270 + "height": 320 } }, { @@ -1511,7 +2179,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 109 + "__id__": 151 }, "propertyPath": [ "_lpos" @@ -1519,7 +2187,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": 50, + "y": 75, "z": 0 } }, @@ -1532,7 +2200,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 111 + "__id__": 153 }, "propertyPath": [ "_lpos" @@ -1540,7 +2208,7 @@ "value": { "__type__": "cc.Vec3", "x": 84, - "y": 114, + "y": 139, "z": 0 } }, @@ -1553,7 +2221,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 113 + "__id__": 155 }, "propertyPath": [ "_lpos" @@ -1561,7 +2229,7 @@ "value": { "__type__": "cc.Vec3", "x": -61.79599999999999, - "y": -114.26499999999999, + "y": -139.265, "z": 0 } }, @@ -1574,7 +2242,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 115 + "__id__": 157 }, "propertyPath": [ "_lpos" @@ -1582,7 +2250,7 @@ "value": { "__type__": "cc.Vec3", "x": 60.925, - "y": -114.26499999999999, + "y": -139.265, "z": 0 } }, @@ -1595,7 +2263,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 117 + "__id__": 159 }, "propertyPath": [ "_lpos" @@ -1603,7 +2271,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": -41.72399999999999, + "y": -16.72399999999999, "z": 0 } }, @@ -1616,7 +2284,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 119 + "__id__": 161 }, "propertyPath": [ "_lpos" @@ -1624,7 +2292,7 @@ "value": { "__type__": "cc.Vec3", "x": -84, - "y": 114, + "y": 139, "z": 0 } }, @@ -1637,7 +2305,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 121 + "__id__": 163 }, "propertyPath": [ "_contentSize" @@ -1654,22 +2322,170 @@ "aePszddr1FjZ9yJvRxiJCh" ] }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 165 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 210, + "height": 320 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "fbT2L4/5lBv6CDydZR8SkP", + "13j2oupQRMUoUyChWYn2yc" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 167 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 210, + "height": 320 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "fbT2L4/5lBv6CDydZR8SkP", + "c8mzU+nw5GLJ4CZ7ZTe6eE" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 169 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 420, + "height": 640 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "fbT2L4/5lBv6CDydZR8SkP", + "5eZRKQByFG0LW2QA/PUw2u" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 171 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 412, + "height": 628 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "fbT2L4/5lBv6CDydZR8SkP", + "4buoN7nzRM9Kty43yoN7ul" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 173 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 180, + "height": 140 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "fbT2L4/5lBv6CDydZR8SkP", + "faGw1NMRpJ+IWtI609CAxN" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 175 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 360, + "height": 280 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "fbT2L4/5lBv6CDydZR8SkP", + "5cf2X5S4JMQ7x3zijgLWIX" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 177 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 75, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "fbT2L4/5lBv6CDydZR8SkP", + "69ZX4yvCZL67xK4+SdFMO0" + ] + }, { "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 24 }, "_enabled": true, "__prefab": { - "__id__": 123 + "__id__": 179 }, "_contentSize": { "__type__": "cc.Size", "width": 720.0000000000006, - "height": 300 + "height": 330 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1688,11 +2504,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 24 }, "_enabled": true, "__prefab": { - "__id__": 125 + "__id__": 181 }, "_alignFlags": 42, "_target": null, @@ -1701,7 +2517,7 @@ "_top": 600, "_bottom": 0, "_horizontalCenter": 0, - "_verticalCenter": 0, + "_verticalCenter": 17.543000000000006, "_isAbsLeft": true, "_isAbsRight": true, "_isAbsTop": true, @@ -1724,11 +2540,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 24 }, "_enabled": false, "__prefab": { - "__id__": 127 + "__id__": 183 }, "_resizeMode": 1, "_layoutType": 1, @@ -1762,11 +2578,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 24 }, "_enabled": true, "__prefab": { - "__id__": 129 + "__id__": 185 }, "_id": "" }, @@ -1797,31 +2613,31 @@ }, "_children": [ { - "__id__": 132 + "__id__": 188 }, { - "__id__": 153 + "__id__": 209 } ], "_active": true, "_components": [ { - "__id__": 168 + "__id__": 224 }, { - "__id__": 170 + "__id__": 226 }, { - "__id__": 172 + "__id__": 228 } ], "_prefab": { - "__id__": 174 + "__id__": 230 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -531.734, + "y": -264.206, "z": 0 }, "_lrot": { @@ -1853,30 +2669,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 131 + "__id__": 187 }, "_children": [ { - "__id__": 133 + "__id__": 189 }, { - "__id__": 139 + "__id__": 195 } ], "_active": true, "_components": [ { - "__id__": 145 + "__id__": 201 }, { - "__id__": 147 + "__id__": 203 }, { - "__id__": 149 + "__id__": 205 } ], "_prefab": { - "__id__": 152 + "__id__": 208 }, "_lpos": { "__type__": "cc.Vec3", @@ -1913,20 +2729,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 132 + "__id__": 188 }, "_children": [], "_active": true, "_components": [ { - "__id__": 134 + "__id__": 190 }, { - "__id__": 136 + "__id__": 192 } ], "_prefab": { - "__id__": 138 + "__id__": 194 }, "_lpos": { "__type__": "cc.Vec3", @@ -1963,11 +2779,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 133 + "__id__": 189 }, "_enabled": true, "__prefab": { - "__id__": 135 + "__id__": 191 }, "_contentSize": { "__type__": "cc.Size", @@ -1991,11 +2807,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 133 + "__id__": 189 }, "_enabled": true, "__prefab": { - "__id__": 137 + "__id__": 193 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2072,20 +2888,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 132 + "__id__": 188 }, "_children": [], "_active": true, "_components": [ { - "__id__": 140 + "__id__": 196 }, { - "__id__": 142 + "__id__": 198 } ], "_prefab": { - "__id__": 144 + "__id__": 200 }, "_lpos": { "__type__": "cc.Vec3", @@ -2122,11 +2938,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 139 + "__id__": 195 }, "_enabled": true, "__prefab": { - "__id__": 141 + "__id__": 197 }, "_contentSize": { "__type__": "cc.Size", @@ -2150,11 +2966,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 139 + "__id__": 195 }, "_enabled": true, "__prefab": { - "__id__": 143 + "__id__": 199 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2231,11 +3047,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 132 + "__id__": 188 }, "_enabled": true, "__prefab": { - "__id__": 146 + "__id__": 202 }, "_contentSize": { "__type__": "cc.Size", @@ -2259,11 +3075,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 132 + "__id__": 188 }, "_enabled": true, "__prefab": { - "__id__": 148 + "__id__": 204 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2307,15 +3123,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 132 + "__id__": 188 }, "_enabled": true, "__prefab": { - "__id__": 150 + "__id__": 206 }, "clickEvents": [ { - "__id__": 151 + "__id__": 207 } ], "_interactable": true, @@ -2390,27 +3206,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 131 + "__id__": 187 }, "_children": [ { - "__id__": 154 + "__id__": 210 } ], "_active": true, "_components": [ { - "__id__": 160 + "__id__": 216 }, { - "__id__": 162 + "__id__": 218 }, { - "__id__": 164 + "__id__": 220 } ], "_prefab": { - "__id__": 167 + "__id__": 223 }, "_lpos": { "__type__": "cc.Vec3", @@ -2447,20 +3263,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 153 + "__id__": 209 }, "_children": [], "_active": true, "_components": [ { - "__id__": 155 + "__id__": 211 }, { - "__id__": 157 + "__id__": 213 } ], "_prefab": { - "__id__": 159 + "__id__": 215 }, "_lpos": { "__type__": "cc.Vec3", @@ -2497,11 +3313,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 154 + "__id__": 210 }, "_enabled": true, "__prefab": { - "__id__": 156 + "__id__": 212 }, "_contentSize": { "__type__": "cc.Size", @@ -2525,11 +3341,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 154 + "__id__": 210 }, "_enabled": true, "__prefab": { - "__id__": 158 + "__id__": 214 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2606,11 +3422,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 153 + "__id__": 209 }, "_enabled": true, "__prefab": { - "__id__": 161 + "__id__": 217 }, "_contentSize": { "__type__": "cc.Size", @@ -2634,11 +3450,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 153 + "__id__": 209 }, "_enabled": true, "__prefab": { - "__id__": 163 + "__id__": 219 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2682,15 +3498,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 153 + "__id__": 209 }, "_enabled": true, "__prefab": { - "__id__": 165 + "__id__": 221 }, "clickEvents": [ { - "__id__": 166 + "__id__": 222 } ], "_interactable": true, @@ -2765,11 +3581,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 131 + "__id__": 187 }, "_enabled": true, "__prefab": { - "__id__": 169 + "__id__": 225 }, "_contentSize": { "__type__": "cc.Size", @@ -2793,11 +3609,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 131 + "__id__": 187 }, "_enabled": true, "__prefab": { - "__id__": 171 + "__id__": 227 }, "_resizeMode": 1, "_layoutType": 1, @@ -2831,18 +3647,18 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 131 + "__id__": 187 }, "_enabled": true, "__prefab": { - "__id__": 173 + "__id__": 229 }, "_alignFlags": 4, "_target": null, "_left": 0, "_right": 0, "_top": 0, - "_bottom": 58.26599999999996, + "_bottom": 325.794, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -2884,7 +3700,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 176 + "__id__": 232 }, "_contentSize": { "__type__": "cc.Size", @@ -2912,7 +3728,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 178 + "__id__": 234 }, "_alignFlags": 45, "_target": null, @@ -2948,7 +3764,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 180 + "__id__": 236 }, "_id": "" }, @@ -2969,13 +3785,13 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 85 + "__id__": 127 }, { - "__id__": 48 + "__id__": 76 }, { - "__id__": 11 + "__id__": 25 } ] } diff --git a/assets/script/game/common/config/CardSet.ts b/assets/script/game/common/config/CardSet.ts index f29ae385..7a51183f 100644 --- a/assets/script/game/common/config/CardSet.ts +++ b/assets/script/game/common/config/CardSet.ts @@ -2,6 +2,7 @@ import * as exp from "constants" import { HeroInfo, HeroList, HType } from "./heroSet" import { FightSet } from "./GameSet" import { oops } from "db://oops-framework/core/Oops" +import { SkillOverrides } from "./SkillSet" class I18nString { constructor(private key: string, private params?: any[]) { } @@ -62,6 +63,7 @@ export interface CardConfig { t_times?: number // 触发次数 t_inv?: number // 触发间隔(秒) keep_waves?: number // 维持的波次数（-1表示持续到战斗结束，0或undefined表示仅本波次） + overrides?: SkillOverrides // 技能参数覆写（如自定义伤害ap、buff值、金币数等） } export const CardsUpSet: Record = { 1: 50, diff --git a/assets/script/game/hero/SCastSystem.ts b/assets/script/game/hero/SCastSystem.ts index 15cf3f30..78d6fc73 100644 --- a/assets/script/game/hero/SCastSystem.ts +++ b/assets/script/game/hero/SCastSystem.ts @@ -57,7 +57,7 @@ export class SCastSystem extends ecs.ComblockSystem implements ecs.ISystemUpdate // 卡牌技能直接触发 if (args.isCardSkill) { - this.forceCastCardSkill(args.s_uuid, args.card_lv || 1, args.targetPos || new Vec3(FightSet.CSKILL_START_X, FightSet.CSKILL_START_Y, 0)); + this.forceCastCardSkill(args.s_uuid, args.card_lv || 1, args.targetPos || new Vec3(FightSet.CSKILL_START_X, FightSet.CSKILL_START_Y, 0), args.overrides); return; } @@ -70,9 +70,10 @@ export class SCastSystem extends ecs.ComblockSystem implements ecs.ISystemUpdate * 强制执行卡牌技能 * 卡牌技能没有施法者主体，直接从指定坐标释放，或者对全体/随机友方生效 */ - public forceCastCardSkill(s_uuid: number, cardLv: number, spawnPos: Vec3) { - const config = SkillSet[s_uuid]; + public forceCastCardSkill(s_uuid: number, cardLv: number, spawnPos: Vec3, overrides?: SkillOverrides) { + let config = SkillSet[s_uuid]; if (!config) return; + config = mergeSkillParams(config, overrides); // 如果是敌方目标，没有战斗时不释放 const isEnemyTarget = !this.isSelfSkill(config.TGroup) && !this.isFriendlySkill(config.TGroup); @@ -119,13 +120,13 @@ export class SCastSystem extends ecs.ComblockSystem implements ecs.ISystemUpdate this.applyFriendlySkillEffects(s_uuid, cardLv, config, null as any, mockAttrs, friendlyTargets, spawnPos); } else { const enemyTargetPos = this.resolveRepeatCastTargetPos(new Vec3(spawnPos.x + 300, spawnPos.y, spawnPos.z), i); - this.createSkillEntityForCard(s_uuid, cardLv, mockAttrs, spawnPos, enemyTargetPos, i); + this.createSkillEntityForCard(s_uuid, cardLv, mockAttrs, spawnPos, enemyTargetPos, i, overrides); } } } /** 专用于卡牌施放的技能实体生成 */ - private createSkillEntityForCard(s_uuid: number, skillLv: number, mockAttrs: HeroAttrsComp, startPos: Vec3, targetPos: Vec3 | null, castIndex: number = 0) { + private createSkillEntityForCard(s_uuid: number, skillLv: number, mockAttrs: HeroAttrsComp, startPos: Vec3, targetPos: Vec3 | null, castIndex: number = 0, overrides?: SkillOverrides) { const scene = smc.map.MapView.scene; const parent = scene.entityLayer?.node?.getChildByName("SKILL"); if (!parent || !targetPos) return; @@ -140,7 +141,7 @@ export class SCastSystem extends ecs.ComblockSystem implements ecs.ISystemUpdate box_group: BoxSet.HERO } as any; - skill.load(actualStartPos, parent, s_uuid, targetPos.clone(), mockView, mockAttrs, skillLv, 0); + skill.load(actualStartPos, parent, s_uuid, targetPos.clone(), mockView, mockAttrs, skillLv, 0, overrides); } /** 空施法计划：用于“当前无可施法技能”时的统一返回 */ private readonly emptyCastPlan = { skillId: 0, skillLv: 1, isFriendly: false, targetPos: null as Vec3 | null, targetEids: [] as number[], overrides: undefined as SkillOverrides | undefined }; diff --git a/assets/script/game/map/SkillBoxComp.ts b/assets/script/game/map/SkillBoxComp.ts index b132268a..2f974e30 100644 --- a/assets/script/game/map/SkillBoxComp.ts +++ b/assets/script/game/map/SkillBoxComp.ts @@ -30,7 +30,7 @@ import { _decorator, Node, Prefab, Sprite, Label, Vec3, resources, SpriteAtlas } import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS"; import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/module/common/CCComp"; import { CardPoolList } from "../common/config/CardSet"; -import { SkillSet } from "../common/config/SkillSet"; +import { SkillSet, SkillOverrides } from "../common/config/SkillSet"; import { oops } from "db://oops-framework/core/Oops"; import { GameEvent } from "../common/config/GameEvent"; import { smc } from "../common/SingletonModuleComp"; @@ -70,6 +70,8 @@ export class SkillBoxComp extends CCComp { private trigger_interval: number = 0; /** 维持的波次数（-1表示直到战斗结束，0表示不跨波次，>0表示维持的具体波次数） */ private keep_waves: number = 0; + /** 技能覆写参数（自定义伤害、Buff等） */ + private overrides?: SkillOverrides; // ======================== 运行时状态 ======================== @@ -125,6 +127,7 @@ export class SkillBoxComp extends CCComp { this.trigger_times = config.t_times ?? 1; this.trigger_interval = config.t_inv ?? 0; this.keep_waves = config.keep_waves ?? 0; + this.overrides = config.overrides; } this.current_trigger_times = 0; @@ -285,7 +288,8 @@ export class SkillBoxComp extends CCComp { s_uuid: this.s_uuid, isCardSkill: true, // 标记为卡牌技能（区别于英雄自身技能） card_lv: this.card_lv, - targetPos: targetPos + targetPos: targetPos, + overrides: this.overrides }); }