From 8cb52f484ec7429edfb38fb9887dc1e3e2a48479 Mon Sep 17 00:00:00 2001 From: panw Date: Fri, 16 Jan 2026 10:07:09 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=B8=B8=E6=88=8F=E9=85=8D=E7=BD=AE):=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0CardKind=E6=9E=9A=E4=B8=BE=E5=B9=B6=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E8=8B=B1=E9=9B=84=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 为卡牌系统添加CardKind枚举类型定义 在heroInfo接口中添加icon字段并更新所有英雄配置 调整ubtns.plist.meta中的边框值 --- assets/resources/gui/ubtns.plist.meta | 8 +- assets/resources/gui/uis/bgs/card.prefab | 1853 ++++++++++++++++++- assets/script/game/common/config/CardSet.ts | 10 + assets/script/game/common/config/heroSet.ts | 49 +- 4 files changed, 1797 insertions(+), 123 deletions(-) diff --git a/assets/resources/gui/ubtns.plist.meta b/assets/resources/gui/ubtns.plist.meta index c5fe9382..4481e7f0 100644 --- a/assets/resources/gui/ubtns.plist.meta +++ b/assets/resources/gui/ubtns.plist.meta @@ -2784,10 +2784,10 @@ "height": 63, "rawWidth": 229, "rawHeight": 63, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, + "borderTop": 30, + "borderBottom": 31, + "borderLeft": 30, + "borderRight": 30, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, diff --git a/assets/resources/gui/uis/bgs/card.prefab b/assets/resources/gui/uis/bgs/card.prefab index b3c08a26..d483b02d 100644 --- a/assets/resources/gui/uis/bgs/card.prefab +++ b/assets/resources/gui/uis/bgs/card.prefab @@ -34,29 +34,41 @@ "__id__": 34 }, { - "__id__": 52 + "__id__": 42 }, { - "__id__": 68 + "__id__": 50 + }, + { + "__id__": 58 }, { "__id__": 76 + }, + { + "__id__": 92 + }, + { + "__id__": 100 + }, + { + "__id__": 110 } ], "_active": true, "_components": [ { - "__id__": 86 + "__id__": 158 }, { - "__id__": 88 + "__id__": 160 }, { - "__id__": 90 + "__id__": 162 } ], "_prefab": { - "__id__": 92 + "__id__": 164 }, "_lpos": { "__type__": "cc.Vec3", @@ -89,7 +101,7 @@ }, { "__type__": "cc.Node", - "_name": "blue", + "_name": "atk", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -154,8 +166,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 160, - "height": 240 + "width": 330, + "height": 480 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -264,14 +276,14 @@ }, { "__type__": "cc.Node", - "_name": "green", + "_name": "atked", "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 1 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 11 @@ -439,7 +451,7 @@ }, { "__type__": "cc.Node", - "_name": "orange", + "_name": "buff", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -504,8 +516,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 160, - "height": 240 + "width": 330, + "height": 480 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -614,14 +626,14 @@ }, { "__type__": "cc.Node", - "_name": "white", + "_name": "attr", "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 1 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 27 @@ -691,7 +703,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "1c55wXKYBA3Zv//8T4YhGK" + "fileId": "c0I9LgkeVPC6/3xJXeAL1j" }, { "__type__": "cc.Sprite", @@ -710,9 +722,540 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 185, - "g": 185, - "b": 185, + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "deedea09-8f2b-400f-9803-4cfd38e45d1a@5ab11", + "__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": { + "__uuid__": "deedea09-8f2b-400f-9803-4cfd38e45d1a", + "__expectedType__": "cc.SpriteAtlas" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "7dThX6r1tAXaZvl3UBafTA" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 26 + }, + "_enabled": true, + "__prefab": { + "__id__": 32 + }, + "_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": 229, + "_originalHeight": 63, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "343rYDTzJMDoO2bGtJtWVq" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "ddEOfzvDJOBr3n53tMUnyn", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "skill", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 35 + }, + { + "__id__": 37 + }, + { + "__id__": 39 + } + ], + "_prefab": { + "__id__": 41 + }, + "_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": 0.5, + "y": 0.5, + "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__": 34 + }, + "_enabled": true, + "__prefab": { + "__id__": 36 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 330, + "height": 480 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "239LLY9W1BWJENBw2WRIdy" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 34 + }, + "_enabled": true, + "__prefab": { + "__id__": 38 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "deedea09-8f2b-400f-9803-4cfd38e45d1a@48c4e", + "__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": { + "__uuid__": "deedea09-8f2b-400f-9803-4cfd38e45d1a", + "__expectedType__": "cc.SpriteAtlas" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "27zQqA711DFr6247n6gVuP" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 34 + }, + "_enabled": true, + "__prefab": { + "__id__": 40 + }, + "_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": 229, + "_originalHeight": 63, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "5fS8TZL/ZNP4t+Pft/CiFK" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "daRCR4fA9GbIYByOc7zRH7", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "hpless", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 43 + }, + { + "__id__": 45 + }, + { + "__id__": 47 + } + ], + "_prefab": { + "__id__": 49 + }, + "_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": 0.5, + "y": 0.5, + "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__": 42 + }, + "_enabled": true, + "__prefab": { + "__id__": 44 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 330, + "height": 480 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "02zonul2dOUpkEKAk+klLb" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 42 + }, + "_enabled": true, + "__prefab": { + "__id__": 46 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 19, + "b": 19, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "deedea09-8f2b-400f-9803-4cfd38e45d1a@ec412", + "__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": "5cy2KRc1VMSYtSYmAHuUEh" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 42 + }, + "_enabled": true, + "__prefab": { + "__id__": 48 + }, + "_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": 229, + "_originalHeight": 63, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "83g3FBU9FIeKXvBhalvbXQ" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "d87i4Jd6dMzYXl7Q/yinrI", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "dead", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 51 + }, + { + "__id__": 53 + }, + { + "__id__": 55 + } + ], + "_prefab": { + "__id__": 57 + }, + "_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": 0.5, + "y": 0.5, + "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__": 50 + }, + "_enabled": true, + "__prefab": { + "__id__": 52 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 330, + "height": 480 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "1c55wXKYBA3Zv//8T4YhGK" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 50 + }, + "_enabled": true, + "__prefab": { + "__id__": 54 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 194, + "g": 194, + "b": 194, "a": 255 }, "_spriteFrame": { @@ -744,11 +1287,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 26 + "__id__": 50 }, "_enabled": true, "__prefab": { - "__id__": 32 + "__id__": 56 }, "_alignFlags": 45, "_target": null, @@ -797,26 +1340,26 @@ }, "_children": [ { - "__id__": 35 + "__id__": 59 } ], "_active": true, "_components": [ { - "__id__": 43 + "__id__": 67 }, { - "__id__": 45 + "__id__": 69 }, { - "__id__": 47 + "__id__": 71 }, { - "__id__": 49 + "__id__": 73 } ], "_prefab": { - "__id__": 51 + "__id__": 75 }, "_lpos": { "__type__": "cc.Vec3", @@ -853,23 +1396,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 34 + "__id__": 58 }, "_children": [], "_active": true, "_components": [ { - "__id__": 36 + "__id__": 60 }, { - "__id__": 38 + "__id__": 62 }, { - "__id__": 40 + "__id__": 64 } ], "_prefab": { - "__id__": 42 + "__id__": 66 }, "_lpos": { "__type__": "cc.Vec3", @@ -906,11 +1449,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 35 + "__id__": 59 }, "_enabled": true, "__prefab": { - "__id__": 37 + "__id__": 61 }, "_contentSize": { "__type__": "cc.Size", @@ -934,11 +1477,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 35 + "__id__": 59 }, "_enabled": true, "__prefab": { - "__id__": 39 + "__id__": 63 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -982,11 +1525,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 35 + "__id__": 59 }, "_enabled": true, "__prefab": { - "__id__": 41 + "__id__": 65 }, "_alignFlags": 41, "_target": null, @@ -1031,11 +1574,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 34 + "__id__": 58 }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 68 }, "_contentSize": { "__type__": "cc.Size", @@ -1059,11 +1602,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 34 + "__id__": 58 }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 70 }, "_type": 0, "_inverted": false, @@ -1081,11 +1624,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 34 + "__id__": 58 }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 72 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1127,11 +1670,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 34 + "__id__": 58 }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 74 }, "_alignFlags": 41, "_target": null, @@ -1180,23 +1723,23 @@ }, "_children": [ { - "__id__": 53 + "__id__": 77 } ], "_active": true, "_components": [ { - "__id__": 61 + "__id__": 85 }, { - "__id__": 63 + "__id__": 87 }, { - "__id__": 65 + "__id__": 89 } ], "_prefab": { - "__id__": 67 + "__id__": 91 }, "_lpos": { "__type__": "cc.Vec3", @@ -1233,23 +1776,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 52 + "__id__": 76 }, "_children": [], "_active": true, "_components": [ { - "__id__": 54 + "__id__": 78 }, { - "__id__": 56 + "__id__": 80 }, { - "__id__": 58 + "__id__": 82 } ], "_prefab": { - "__id__": 60 + "__id__": 84 }, "_lpos": { "__type__": "cc.Vec3", @@ -1286,11 +1829,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 53 + "__id__": 77 }, "_enabled": true, "__prefab": { - "__id__": 55 + "__id__": 79 }, "_contentSize": { "__type__": "cc.Size", @@ -1314,11 +1857,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 53 + "__id__": 77 }, "_enabled": true, "__prefab": { - "__id__": 57 + "__id__": 81 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1382,11 +1925,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 53 + "__id__": 77 }, "_enabled": true, "__prefab": { - "__id__": 59 + "__id__": 83 }, "_alignFlags": 45, "_target": null, @@ -1431,11 +1974,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 52 + "__id__": 76 }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 86 }, "_contentSize": { "__type__": "cc.Size", @@ -1459,11 +2002,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 52 + "__id__": 76 }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 88 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1504,11 +2047,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 52 + "__id__": 76 }, "_enabled": true, "__prefab": { - "__id__": 66 + "__id__": 90 }, "_alignFlags": 45, "_target": null, @@ -1559,17 +2102,17 @@ "_active": true, "_components": [ { - "__id__": 69 + "__id__": 93 }, { - "__id__": 71 + "__id__": 95 }, { - "__id__": 73 + "__id__": 97 } ], "_prefab": { - "__id__": 75 + "__id__": 99 }, "_lpos": { "__type__": "cc.Vec3", @@ -1606,11 +2149,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 68 + "__id__": 92 }, "_enabled": true, "__prefab": { - "__id__": 70 + "__id__": 94 }, "_contentSize": { "__type__": "cc.Size", @@ -1634,11 +2177,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 68 + "__id__": 92 }, "_enabled": true, "__prefab": { - "__id__": 72 + "__id__": 96 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1702,11 +2245,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 68 + "__id__": 92 }, "_enabled": true, "__prefab": { - "__id__": 74 + "__id__": 98 }, "_alignFlags": 40, "_target": null, @@ -1755,17 +2298,17 @@ }, "_children": [ { - "__id__": 77 + "__id__": 101 } ], "_active": true, "_components": [ { - "__id__": 83 + "__id__": 107 } ], "_prefab": { - "__id__": 85 + "__id__": 109 }, "_lpos": { "__type__": "cc.Vec3", @@ -1802,20 +2345,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 76 + "__id__": 100 }, "_children": [], "_active": true, "_components": [ { - "__id__": 78 + "__id__": 102 }, { - "__id__": 80 + "__id__": 104 } ], "_prefab": { - "__id__": 82 + "__id__": 106 }, "_lpos": { "__type__": "cc.Vec3", @@ -1852,11 +2395,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 77 + "__id__": 101 }, "_enabled": true, "__prefab": { - "__id__": 79 + "__id__": 103 }, "_contentSize": { "__type__": "cc.Size", @@ -1880,11 +2423,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 77 + "__id__": 101 }, "_enabled": true, "__prefab": { - "__id__": 81 + "__id__": 105 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1938,11 +2481,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 76 + "__id__": 100 }, "_enabled": true, "__prefab": { - "__id__": 84 + "__id__": 108 }, "_contentSize": { "__type__": "cc.Size", @@ -1973,6 +2516,1126 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "type", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 111 + }, + { + "__id__": 117 + }, + { + "__id__": 123 + }, + { + "__id__": 129 + }, + { + "__id__": 135 + }, + { + "__id__": 141 + }, + { + "__id__": 147 + } + ], + "_active": true, + "_components": [ + { + "__id__": 153 + }, + { + "__id__": 155 + } + ], + "_prefab": { + "__id__": 157 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 6, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 0.5, + "y": 0.5, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "atk", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 110 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 112 + }, + { + "__id__": 114 + } + ], + "_prefab": { + "__id__": 116 + }, + "_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__": 111 + }, + "_enabled": true, + "__prefab": { + "__id__": 113 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 38, + "height": 38 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "7cNqLbF+JNooTISihHda0x" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 111 + }, + "_enabled": true, + "__prefab": { + "__id__": 115 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@d271f", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", + "__expectedType__": "cc.SpriteAtlas" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "6akCwEDKpBE5iEGOuVCzqq" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "20+lEJWuZNt5E8xjdE22fZ", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "atked", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 110 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 118 + }, + { + "__id__": 120 + } + ], + "_prefab": { + "__id__": 122 + }, + "_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__": 117 + }, + "_enabled": true, + "__prefab": { + "__id__": 119 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 38, + "height": 38 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "4ccNBrMH1NUaKh8Jp0UCDf" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 117 + }, + "_enabled": true, + "__prefab": { + "__id__": 121 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@12af8", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "abp14SUAJKK7Mq8YNluE5r" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "2ejcLtaGxJ+44xirMT6n46", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "dead", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 110 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 124 + }, + { + "__id__": 126 + } + ], + "_prefab": { + "__id__": 128 + }, + "_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__": 123 + }, + "_enabled": true, + "__prefab": { + "__id__": 125 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 48, + "height": 38 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "60LN6weW5EyJ/PtyolI/BG" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 123 + }, + "_enabled": true, + "__prefab": { + "__id__": 127 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@2505c", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "0bS64KJ39O34dmadFUk2/h" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "feoNVefa1C2pLrhkf14LWj", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "hpless", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 110 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 130 + }, + { + "__id__": 132 + } + ], + "_prefab": { + "__id__": 134 + }, + "_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__": 129 + }, + "_enabled": true, + "__prefab": { + "__id__": 131 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 42, + "height": 34 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "80L2cMeQ1Ax66Tgwf0d7NQ" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 129 + }, + "_enabled": true, + "__prefab": { + "__id__": 133 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@bc403", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "80V3VEwNRGAK1k2VK6knQn" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "28DJLTaJJIgIegSsjMei5m", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "skill", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 110 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 136 + }, + { + "__id__": 138 + } + ], + "_prefab": { + "__id__": 140 + }, + "_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__": 135 + }, + "_enabled": true, + "__prefab": { + "__id__": 137 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 30, + "height": 38 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "d6lPuX8upP47CuRtNCPoKk" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 135 + }, + "_enabled": true, + "__prefab": { + "__id__": 139 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@84af4", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", + "__expectedType__": "cc.SpriteAtlas" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a1QWHmohRBDYyfejiGasc/" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "f03UtjSmJDzLIbdDohuOjP", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "attr", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 110 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 142 + }, + { + "__id__": 144 + } + ], + "_prefab": { + "__id__": 146 + }, + "_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__": 141 + }, + "_enabled": true, + "__prefab": { + "__id__": 143 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 54, + "height": 40 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "2aIVFB/itMwo7khT23BPUi" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 141 + }, + "_enabled": true, + "__prefab": { + "__id__": 145 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@3f218", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", + "__expectedType__": "cc.SpriteAtlas" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a5lcLbh7ZP5aaJGAJ+AiVp" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "6dKy60hftEG7iU6zIUkD/E", + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "buff", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 110 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 148 + }, + { + "__id__": 150 + } + ], + "_prefab": { + "__id__": 152 + }, + "_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__": 147 + }, + "_enabled": true, + "__prefab": { + "__id__": 149 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 32, + "height": 38 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "79dpB8xFVCfbY6JAusDFIT" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 147 + }, + "_enabled": true, + "__prefab": { + "__id__": 151 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@30097", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "33m3555OhAMp7VSsWxhBmD" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "2b027wgfpE247X5yfCs5d2", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 110 + }, + "_enabled": true, + "__prefab": { + "__id__": 154 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 60, + "height": 60 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c6DbFjID1K5IzrizUbf+UB" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 110 + }, + "_enabled": true, + "__prefab": { + "__id__": 156 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "deedea09-8f2b-400f-9803-4cfd38e45d1a@eb208", + "__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__": "deedea09-8f2b-400f-9803-4cfd38e45d1a", + "__expectedType__": "cc.SpriteAtlas" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "dcyfR0uBpJd4B2sbMdGVUr" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "e5HV27jalPQbjFtA2QB9zh", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -1983,7 +3646,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 87 + "__id__": 159 }, "_contentSize": { "__type__": "cc.Size", @@ -2011,7 +3674,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 89 + "__id__": 161 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2056,7 +3719,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 91 + "__id__": 163 }, "clickEvents": [], "_interactable": true, diff --git a/assets/script/game/common/config/CardSet.ts b/assets/script/game/common/config/CardSet.ts index 8ddea113..08d185ac 100644 --- a/assets/script/game/common/config/CardSet.ts +++ b/assets/script/game/common/config/CardSet.ts @@ -36,6 +36,16 @@ export interface IPoolConfig { tag?: string; // 辅助筛选（从全池中筛选带tag的，如 "special"） } +export enum CardKind { + Atk = 1, + Atted = 2, + Buff = 3, + Attr = 4, + Skill = 5, + Hp = 6, + Dead = 7, + Partner = 8, +} // 默认单卡权重 const DEFAULT_CARD_WEIGHT = 100; diff --git a/assets/script/game/common/config/heroSet.ts b/assets/script/game/common/config/heroSet.ts index b5aed734..42876cca 100644 --- a/assets/script/game/common/config/heroSet.ts +++ b/assets/script/game/common/config/heroSet.ts @@ -103,6 +103,7 @@ export enum HeroUpSet { export interface heroInfo { uuid: number; // 唯一标识（英雄5000段，怪物5200段） name: string; // 显示名称 + icon: string; // 图标名称（对应美术资源名） path: string; // 资源路径（对应美术资源名） fac: FacSet; // 阵营（FacSet.HERO 或 FacSet.MON） kind: number; // 未使用 @@ -136,37 +137,37 @@ export const CanSelectHeros: Record = { export const HeroInfo: Record = { // ========== 英雄角色 ========== - 5001:{uuid:5001,name:"盾战士",path:"hk1", fac:FacSet.HERO, kind:1,as:1.5, + 5001:{uuid:5001,name:"盾战士",icon:"4001",path:"hk1", fac:FacSet.HERO, kind:1,as:1.5, type:HType.warrior,lv:1,hp:200,mp:200,def:0,ap:15,speed:120,skills:[6001,6004], rangeType: SkillRange.Melee, buff:[],tal:[],info:"盾战士"}, - 5002:{uuid:5002,name:"奥术法师",path:"hm2", fac:FacSet.HERO, kind:2,as:1.5, + 5002:{uuid:5002,name:"奥术法师",icon:"4001",path:"hm2", fac:FacSet.HERO, kind:2,as:1.5, type:HType.mage,lv:1,hp:92,mp:135,def:0,ap:14,speed:95,skills:[6003,6101], rangeType: SkillRange.Long, buff:[],tal:[],info:"奥术法师"}, - 5003:{uuid:5003,name:"射手",path:"ha1", fac:FacSet.HERO, kind:2,as:1.5, + 5003:{uuid:5003,name:"射手",icon:"4001",path:"ha1", fac:FacSet.HERO, kind:2,as:1.5, type:HType.remote,lv:1,hp:100,mp:80,def:0,ap:18,speed:140,skills:[6002,6100], rangeType: SkillRange.Long, buff:[],tal:[],info:"射手"}, - 5005:{uuid:5005,name:"牧师",path:"hh1", fac:FacSet.HERO, kind:2,as:1.5, + 5005:{uuid:5005,name:"牧师",icon:"4001",path:"hh1", fac:FacSet.HERO, kind:2,as:1.5, type:HType.mage,lv:1,hp:88,mp:135,def:0,ap:15,speed:100,skills:[6003,6100], rangeType: SkillRange.Mid, buff:[],tal:[],info:"牧师"}, - 5004:{uuid:5004,name:"火焰法师",path:"hm1", fac:FacSet.HERO, kind:2,as:1.5, + 5004:{uuid:5004,name:"火焰法师",icon:"4001",path:"hm1", fac:FacSet.HERO, kind:2,as:1.5, type:HType.mage,lv:1,hp:85,mp:140,def:0,ap:16,speed:90,skills:[6003,6101], rangeType: SkillRange.Mid, buff:[],tal:[],info:"火焰法师"}, - 5006:{uuid:5006,name:"召唤法师",path:"hz1", fac:FacSet.HERO, kind:2,as:1.5, + 5006:{uuid:5006,name:"召唤法师",icon:"4001",path:"hz1", fac:FacSet.HERO, kind:2,as:1.5, type:HType.support,lv:1,hp:115,mp:145,def:0,ap:8,speed:105,skills:[6003,6101], rangeType: SkillRange.Mid, buff:[],tal:[],info:"召唤法师"}, - 5007:{uuid:5007,name:"刺客",path:"hc1", fac:FacSet.HERO, kind:1,as:1.5, + 5007:{uuid:5007,name:"刺客",icon:"4001",path:"hc1", fac:FacSet.HERO, kind:1,as:1.5, type:HType.assassin,lv:1,hp:80,mp:60,def:0,ap:22,speed:180,skills:[6001,6004], rangeType: SkillRange.Melee, buff:[],tal:[],info:"刺客"}, @@ -175,51 +176,51 @@ export const HeroInfo: Record = { // 1. 基础近战型 - 5201:{uuid:5201,name:"兽人战士",path:"mo1", fac:FacSet.MON, kind:1,as:3.0, - type:HType.warrior,lv:1,hp:40,mp:100,def:0,ap:5,speed:180,skills:[6005], + 5201:{uuid:5201,name:"兽人战士",icon:"4001",path:"mo1", fac:FacSet.MON, kind:1,as:3.0, + type:HType.warrior,lv:1,hp:40,mp:100,def:0,ap:5,speed:180,skills:[6001], rangeType: SkillRange.Melee, buff:[],tal:[],info:"标准炮灰：确保英雄能完成3次普攻积累天赋计数"}, // 2. 快速突击型 - 5301:{uuid:5301,name:"兽人斥候",path:"mo1", fac:FacSet.MON, kind:1,as:1.2, - type:HType.assassin,lv:1,hp:30,mp:100,def:0,ap:12,speed:400,skills:[6005], + 5301:{uuid:5301,name:"兽人斥候",icon:"4001",path:"mo1", fac:FacSet.MON, kind:1,as:1.2, + type:HType.assassin,lv:1,hp:30,mp:100,def:0,ap:12,speed:400,skills:[6001], rangeType: SkillRange.Melee, buff:[],tal:[],info:"快速突击：极高移速贴脸，检测护盾(7102)刷新率"}, // 3. 重型坦克型 - 5401:{uuid:5401,name:"兽人卫士",path:"mo1", fac:FacSet.MON, kind:1,as:5.0, - type:HType.warrior,lv:1,hp:400,mp:100,def:5,ap:25,speed:60,skills:[6005], + 5401:{uuid:5401,name:"兽人卫士",icon:"4001",path:"mo1", fac:FacSet.MON, kind:1,as:5.0, + type:HType.warrior,lv:1,hp:400,mp:100,def:5,ap:25,speed:60,skills:[6001], rangeType: SkillRange.Melee, buff:[],tal:[],info:"重型坦克：数值墙，检测玩家破甲(7008)与持续输出"}, // 4. 远程骚扰型 - 5501:{uuid:5501,name:"兽人射手",path:"mo1", fac:FacSet.MON, kind:1,as:3.0, + 5501:{uuid:5501,name:"兽人射手",icon:"4001",path:"mo1", fac:FacSet.MON, kind:1,as:3.0, type:HType.remote,lv:1,hp:50,mp:100,def:0,ap:15,speed:90,skills:[6203], rangeType: SkillRange.Long, buff:[],tal:[],info:"远程骚扰：跨屏打击，迫使阵地分散或移动英雄"}, // 5. 特殊机制型 - 5601:{uuid:5601,name:"兽人自爆兵",path:"mo1", fac:FacSet.MON, kind:1,as:3.0, - type:HType.assassin,lv:1,hp:60,mp:100,def:0,ap:250,speed:220,skills:[6005], + 5601:{uuid:5601,name:"兽人自爆兵",icon:"4001",path:"mo1", fac:FacSet.MON, kind:1,as:3.0, + type:HType.assassin,lv:1,hp:60,mp:100,def:0,ap:250,speed:220,skills:[6001], rangeType: SkillRange.Melee, buff:[],tal:[],info:"特殊机制：极端伤害，漏怪即秒杀，检测减伤(7103)"}, // 召唤师：持续召唤小怪（后续可在技能系统中实现 SType.zhaohuan） - 5602:{uuid:5602,name:"兽人召唤师",path:"mo1", fac:FacSet.MON, kind:1,as:3.0, - type:HType.mage,lv:1,hp:120,mp:300,def:5,ap:8,speed:100,skills:[6005], + 5602:{uuid:5602,name:"兽人召唤师",icon:"4001",path:"mo1", fac:FacSet.MON, kind:1,as:3.0, + type:HType.mage,lv:1,hp:120,mp:300,def:5,ap:8,speed:100,skills:[6001], rangeType: SkillRange.Mid, buff:[],tal:[],info:"战术目标：持续召唤小怪，检测英雄大招清场频率"}, // 治疗者：为周围怪物回血（此处以提升治疗效果和生命回复为基础被动） - 5603:{uuid:5603,name:"兽人祭司",path:"mo1", fac:FacSet.MON, kind:1,as:3.0, - type:HType.support,lv:1,hp:120,mp:300,def:5,ap:6,speed:105,skills:[6005], + 5603:{uuid:5603,name:"兽人祭司",icon:"4001",path:"mo1", fac:FacSet.MON, kind:1,as:3.0, + type:HType.support,lv:1,hp:120,mp:300,def:5,ap:6,speed:105,skills:[6001], rangeType: SkillRange.Melee, buff:[],tal:[],info:"战术目标：为怪群回血，检测玩家沉默(7006)覆盖率"}, // 光环怪：为周围怪物提供增益（此处以Buff效果提升与移动速度提升为基础被动） // Attrs.BUFF_UP=60 (RATIO=1)，Attrs.SPEED=63 (RATIO=1) - 5604:{uuid:5604,name:"兽人图腾师",path:"mo1", fac:FacSet.MON, kind:1,as:3.0, - type:HType.support,lv:1,hp:100,mp:250,def:5,ap:7,speed:110,skills:[6005], + 5604:{uuid:5604,name:"兽人图腾师",icon:"4001",path:"mo1", fac:FacSet.MON, kind:1,as:3.0, + type:HType.support,lv:1,hp:100,mp:250,def:5,ap:7,speed:110,skills:[6001], rangeType: SkillRange.Melee, buff:[],tal:[],info:"战术目标：提供加速光环，改变怪群推进节奏"}, // 6. 精英/BOSS型 - 5701:{uuid:5701,name:"兽人首领(BOSS)",path:"mo1", fac:FacSet.MON, kind:1,as:2.5, - type:HType.warrior,lv:3,hp:25000,mp:500,def:20,ap:80,speed:120,skills:[6005], + 5701:{uuid:5701,name:"兽人首领(BOSS)",icon:"4001",path:"mo1", fac:FacSet.MON, kind:1,as:2.5, + type:HType.warrior,lv:3,hp:25000,mp:500,def:20,ap:80,speed:120,skills:[6001], rangeType: SkillRange.Melee, buff:[],tal:[],info:"终极考验：极高HP，检测大招重置与辐射协同输出"}, };