feat: 新增技能触发类型标识与列表预制体,优化技能提示UI

1.  新增技能触发类型背景标识,支持追击/反击/复活等状态显示
2.  扩展技能提示接口,新增触发类型参数传递
3.  新增list-me列表预制体及其元数据
4.  调整部分UI精灵帧与布局参数
5.  修复技能名称显示调用参数不匹配问题
This commit is contained in:
panFD
2026-06-19 15:40:28 +08:00
parent 9220254c56
commit 3d7c9bfe54
14 changed files with 5287 additions and 4373 deletions

View File

@@ -50,19 +50,22 @@
},
{
"__id__": 295
},
{
"__id__": 307
}
],
"_active": true,
"_components": [
{
"__id__": 307
"__id__": 323
},
{
"__id__": 309
"__id__": 325
}
],
"_prefab": {
"__id__": 311
"__id__": 327
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -5667,6 +5670,396 @@
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
"__type__": "cc.Node",
"_name": "call",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 1
},
"_children": [
{
"__id__": 308
},
{
"__id__": 314
}
],
"_active": true,
"_components": [
{
"__id__": 320
}
],
"_prefab": {
"__id__": 322
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
"y": -23.213,
"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_yellow",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 307
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 309
},
{
"__id__": 311
}
],
"_prefab": {
"__id__": 313
},
"_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.8,
"y": 0.8,
"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__": 308
},
"_enabled": true,
"__prefab": {
"__id__": 310
},
"_contentSize": {
"__type__": "cc.Size",
"width": 185,
"height": 81
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "f5+WQKeepDpI7jXqgvmtiO"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 308
},
"_enabled": true,
"__prefab": {
"__id__": 312
},
"_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@b2501",
"__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": "08MkVcRXlJh64uV97FC5zt"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "979t7Rjp5IGpxx6E++HMV4",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
"__type__": "cc.Node",
"_name": "Label",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 307
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 315
},
{
"__id__": 317
}
],
"_prefab": {
"__id__": 319
},
"_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__": 314
},
"_enabled": true,
"__prefab": {
"__id__": 316
},
"_contentSize": {
"__type__": "cc.Size",
"width": 63.5999755859375,
"height": 54.4
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "feOuVKuYxJK6z+M3tV8Ey3"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 314
},
"_enabled": true,
"__prefab": {
"__id__": 318
},
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_string": "召唤",
"_horizontalAlign": 1,
"_verticalAlign": 1,
"_actualFontSize": 29.8,
"_fontSize": 29.8,
"_fontFamily": "Arial",
"_lineHeight": 40,
"_overflow": 0,
"_enableWrapText": true,
"_font": null,
"_isSystemFontUsed": true,
"_spacingX": 0,
"_isItalic": false,
"_isBold": true,
"_isUnderline": false,
"_underlineHeight": 2,
"_cacheMode": 0,
"_enableOutline": true,
"_outlineColor": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"a": 255
},
"_outlineWidth": 2,
"_enableShadow": false,
"_shadowColor": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"a": 255
},
"_shadowOffset": {
"__type__": "cc.Vec2",
"x": 2,
"y": 2
},
"_shadowBlur": 2,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "00BfCWkAJL/p90pcsuwUDH"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "83KbPaQKpJ3p+hfLZ1PBTs",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 307
},
"_enabled": true,
"__prefab": {
"__id__": 321
},
"_contentSize": {
"__type__": "cc.Size",
"width": 148,
"height": 64.8
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "94GKNoSM1MwIqd0zy183DD"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "57KHqoGQRBmIdHCIXwuEoC",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
"__type__": "cc.UITransform",
"_name": "",
@@ -5677,7 +6070,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 308
"__id__": 324
},
"_contentSize": {
"__type__": "cc.Size",
@@ -5705,7 +6098,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 310
"__id__": 326
},
"Lock": null,
"unLock": null,

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,13 @@
{
"ver": "1.1.50",
"importer": "prefab",
"imported": true,
"uuid": "b2a3067a-af88-4ff7-acdd-7474b8a163d8",
"files": [
".json"
],
"subMetas": {},
"userData": {
"syncNodeName": "list-me"
}
}

View File

@@ -185,10 +185,10 @@
"a": 255
},
"_spriteFrame": {
"__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@d1468",
"__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@d5229",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 0,
"_type": 1,
"_fillType": 0,
"_sizeMode": 0,
"_fillCenter": {
@@ -200,7 +200,10 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": null,
"_atlas": {
"__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73",
"__expectedType__": "cc.SpriteAtlas"
},
"_id": ""
},
{
@@ -279,8 +282,8 @@
},
"_lpos": {
"__type__": "cc.Vec3",
"x": -297.949,
"y": 0,
"x": -276.372,
"y": 8.188,
"z": 0
},
"_lrot": {
@@ -418,8 +421,8 @@
},
"_lpos": {
"__type__": "cc.Vec3",
"x": -299.563,
"y": 0,
"x": -277.986,
"y": 8.188,
"z": 0
},
"_lrot": {
@@ -577,8 +580,8 @@
},
"_lpos": {
"__type__": "cc.Vec3",
"x": -217.727,
"y": 0,
"x": -214.902,
"y": 8.188,
"z": 0
},
"_lrot": {
@@ -590,8 +593,8 @@
},
"_lscale": {
"__type__": "cc.Vec3",
"x": 0.35,
"y": 0.35,
"x": 0.3,
"y": 0.3,
"z": 1
},
"_mobility": 0,
@@ -713,8 +716,8 @@
},
"_lpos": {
"__type__": "cc.Vec3",
"x": -139.467,
"y": 0,
"x": -136.642,
"y": 8.188,
"z": 0
},
"_lrot": {
@@ -872,8 +875,8 @@
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 225.016,
"y": 0,
"x": 167.228,
"y": 8.1,
"z": 0
},
"_lrot": {
@@ -952,8 +955,8 @@
"_string": "999999",
"_horizontalAlign": 0,
"_verticalAlign": 1,
"_actualFontSize": 26,
"_fontSize": 25,
"_actualFontSize": 31,
"_fontSize": 30,
"_fontFamily": "Arial",
"_lineHeight": 40,
"_overflow": 2,
@@ -1031,8 +1034,8 @@
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 181.966,
"y": 0,
"x": 140.032,
"y": 8.1,
"z": 0
},
"_lrot": {
@@ -1044,8 +1047,8 @@
},
"_lscale": {
"__type__": "cc.Vec3",
"x": 0.4,
"y": 0.4,
"x": 0.3,
"y": 0.3,
"z": 1
},
"_mobility": 0,

File diff suppressed because it is too large Load Diff

View File

@@ -3292,7 +3292,7 @@
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
"y": 617.5,
"y": 657.577,
"z": 0
},
"_lrot": {
@@ -3304,8 +3304,8 @@
},
"_lscale": {
"__type__": "cc.Vec3",
"x": 1,
"y": 1,
"x": 1.5,
"y": 1.5,
"z": 1
},
"_mobility": 0,
@@ -3332,8 +3332,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 740,
"height": 55
"width": 540,
"height": 117
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -3369,12 +3369,12 @@
"a": 255
},
"_spriteFrame": {
"__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@98637",
"__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@4dd1c",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 0,
"_fillType": 0,
"_sizeMode": 0,
"_sizeMode": 1,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
@@ -3384,7 +3384,10 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": null,
"_atlas": {
"__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73",
"__expectedType__": "cc.SpriteAtlas"
},
"_id": ""
},
{
@@ -3399,15 +3402,15 @@
"node": {
"__id__": 134
},
"_enabled": true,
"_enabled": false,
"__prefab": {
"__id__": 140
},
"_alignFlags": 41,
"_target": null,
"_left": -10,
"_right": -10,
"_top": -5,
"_left": 90,
"_right": 0,
"_top": -89.59100000000001,
"_bottom": 0,
"_horizontalCenter": 0,
"_verticalCenter": 0,
@@ -3629,10 +3632,10 @@
"__id__": 151
},
"asset": {
"__uuid__": "0c80c911-642f-423a-8ebb-98aebbbe2ef0",
"__uuid__": "b2a3067a-af88-4ff7-acdd-7474b8a163d8",
"__expectedType__": "cc.Prefab"
},
"fileId": "70V66T2DlAP7ksTOaOBDja",
"fileId": "43WU05gfVAPr5YF69YW+M4",
"instance": {
"__id__": 153
},
@@ -3640,7 +3643,7 @@
},
{
"__type__": "cc.PrefabInstance",
"fileId": "50AgFB9kROhppT8Q5wAY6S",
"fileId": "e722VC+kdPfqeaFe1joI7B",
"prefabRootNode": {
"__id__": 1
},
@@ -3670,12 +3673,12 @@
"propertyPath": [
"_name"
],
"value": "melist"
"value": "list-me"
},
{
"__type__": "cc.TargetInfo",
"localID": [
"70V66T2DlAP7ksTOaOBDja"
"43WU05gfVAPr5YF69YW+M4"
]
},
{
@@ -4318,7 +4321,7 @@
"__expectedType__": "cc.Prefab"
},
"melist_prefab": {
"__uuid__": "0c80c911-642f-423a-8ebb-98aebbbe2ef0",
"__uuid__": "b2a3067a-af88-4ff7-acdd-7474b8a163d8",
"__expectedType__": "cc.Prefab"
},
"_id": ""

View File

@@ -11708,10 +11708,10 @@
"height": 98,
"rawWidth": 96,
"rawHeight": 98,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"borderTop": 45,
"borderBottom": 49,
"borderLeft": 48,
"borderRight": 48,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
@@ -11800,8 +11800,8 @@
"height": 237,
"rawWidth": 117,
"rawHeight": 237,
"borderTop": 300,
"borderBottom": 23,
"borderTop": 134,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,