pan/pixelheros
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(card): 完善卡牌图标显示与锁定功能

Browse Source 
- 为英雄卡牌添加动画图标显示，根据配置加载对应动画
- 修复锁定按钮显示逻辑，现在正确显示锁定/解锁状态
- 为技能、buff、英雄等卡牌类型添加图标解析功能
- 更新卡牌预制体，调整图标尺寸和锁定图标
- 删除未使用的动画资源文件
- 优化资源图集配置，调整精灵帧位置
This commit is contained in:
walkpan
2026-03-14 21:39:27 +08:00
parent c7248fe32a
commit 7d0dc04d01
14 changed files with 2027 additions and 5936 deletions
Download Patch File Download Diff File Expand all files Collapse all files

677
assets/resources/game/heros/ha1.prefab
View File

@@ -26,43 +26,28 @@
},
{
"__id__": 26
},
{
"__id__": 37
},
{
"__id__": 46
},
{
"__id__": 55
},
{
"__id__": 64
},
{
"__id__": 73
}
],
"_active": true,
"_components": [
{
"__id__": 82
"__id__": 37
},
{
"__id__": 84
"__id__": 39
},
{
"__id__": 86
"__id__": 41
},
{
"__id__": 88
"__id__": 43
},
{
"__id__": 90
"__id__": 45
}
],
"_prefab": {
"__id__": 92
"__id__": 47
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -666,631 +651,6 @@
"z": 1
}
},
{
"__type__": "cc.Node",
"_objFlags": 0,
"_parent": {
"__id__": 1
},
"_prefab": {
"__id__": 38
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 37
},
"asset": {
"__uuid__": "fb48f231-c2a1-4921-8e71-1ec9b9ba245f",
"__expectedType__": "cc.Prefab"
},
"fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": {
"__id__": 39
},
"targetOverrides": null
},
{
"__type__": "cc.PrefabInstance",
"fileId": "7bMnN2oE5GQa+18/L53x5n",
"prefabRootNode": {
"__id__": 1
},
"mountedChildren": [],
"mountedComponents": [],
"propertyOverrides": [
{
"__id__": 40
},
{
"__id__": 42
},
{
"__id__": 43
},
{
"__id__": 44
},
{
"__id__": 45
}
],
"removedComponents": []
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 41
},
"propertyPath": [
"_name"
],
"value": "up_ap"
},
{
"__type__": "cc.TargetInfo",
"localID": [
"c46/YsCPVOJYA4mWEpNYRx"
]
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 41
},
"propertyPath": [
"_lpos"
],
"value": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
}
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 41
},
"propertyPath": [
"_lrot"
],
"value": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
}
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 41
},
"propertyPath": [
"_euler"
],
"value": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
}
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 41
},
"propertyPath": [
"_active"
],
"value": false
},
{
"__type__": "cc.Node",
"_objFlags": 0,
"_parent": {
"__id__": 1
},
"_prefab": {
"__id__": 47
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 46
},
"asset": {
"__uuid__": "05233bb0-9fd9-44aa-b382-002c517142fd",
"__expectedType__": "cc.Prefab"
},
"fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": {
"__id__": 48
},
"targetOverrides": null
},
{
"__type__": "cc.PrefabInstance",
"fileId": "6fVTLgxWhE1ojXFO/Dt5NC",
"prefabRootNode": {
"__id__": 1
},
"mountedChildren": [],
"mountedComponents": [],
"propertyOverrides": [
{
"__id__": 49
},
{
"__id__": 51
},
{
"__id__": 52
},
{
"__id__": 53
},
{
"__id__": 54
}
],
"removedComponents": []
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 50
},
"propertyPath": [
"_name"
],
"value": "up_hp"
},
{
"__type__": "cc.TargetInfo",
"localID": [
"c46/YsCPVOJYA4mWEpNYRx"
]
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 50
},
"propertyPath": [
"_lpos"
],
"value": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
}
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 50
},
"propertyPath": [
"_lrot"
],
"value": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
}
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 50
},
"propertyPath": [
"_euler"
],
"value": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
}
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 50
},
"propertyPath": [
"_active"
],
"value": false
},
{
"__type__": "cc.Node",
"_objFlags": 0,
"_parent": {
"__id__": 1
},
"_prefab": {
"__id__": 56
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 55
},
"asset": {
"__uuid__": "55e98478-734f-4d85-92b2-0a62a52c494c",
"__expectedType__": "cc.Prefab"
},
"fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": {
"__id__": 57
},
"targetOverrides": null
},
{
"__type__": "cc.PrefabInstance",
"fileId": "24CE2nl1pKeagfwY/qvcWz",
"prefabRootNode": {
"__id__": 1
},
"mountedChildren": [],
"mountedComponents": [],
"propertyOverrides": [
{
"__id__": 58
},
{
"__id__": 60
},
{
"__id__": 61
},
{
"__id__": 62
},
{
"__id__": 63
}
],
"removedComponents": []
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 59
},
"propertyPath": [
"_name"
],
"value": "up_blue"
},
{
"__type__": "cc.TargetInfo",
"localID": [
"c46/YsCPVOJYA4mWEpNYRx"
]
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 59
},
"propertyPath": [
"_lpos"
],
"value": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
}
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 59
},
"propertyPath": [
"_lrot"
],
"value": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
}
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 59
},
"propertyPath": [
"_euler"
],
"value": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
}
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 59
},
"propertyPath": [
"_active"
],
"value": true
},
{
"__type__": "cc.Node",
"_objFlags": 0,
"_parent": {
"__id__": 1
},
"_prefab": {
"__id__": 65
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 64
},
"asset": {
"__uuid__": "deb4a1bb-3f47-4c7c-9be1-352518675a16",
"__expectedType__": "cc.Prefab"
},
"fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": {
"__id__": 66
},
"targetOverrides": null
},
{
"__type__": "cc.PrefabInstance",
"fileId": "298pmNDI5GFYywMGCnqoIY",
"prefabRootNode": {
"__id__": 1
},
"mountedChildren": [],
"mountedComponents": [],
"propertyOverrides": [
{
"__id__": 67
},
{
"__id__": 69
},
{
"__id__": 70
},
{
"__id__": 71
},
{
"__id__": 72
}
],
"removedComponents": []
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 68
},
"propertyPath": [
"_name"
],
"value": "up_green"
},
{
"__type__": "cc.TargetInfo",
"localID": [
"c46/YsCPVOJYA4mWEpNYRx"
]
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 68
},
"propertyPath": [
"_lpos"
],
"value": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
}
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 68
},
"propertyPath": [
"_lrot"
],
"value": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
}
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 68
},
"propertyPath": [
"_euler"
],
"value": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
}
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 68
},
"propertyPath": [
"_active"
],
"value": true
},
{
"__type__": "cc.Node",
"_objFlags": 0,
"_parent": {
"__id__": 1
},
"_prefab": {
"__id__": 74
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 73
},
"asset": {
"__uuid__": "91e5e3e3-d2f1-4522-9f82-649e9bc8f8db",
"__expectedType__": "cc.Prefab"
},
"fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": {
"__id__": 75
},
"targetOverrides": null
},
{
"__type__": "cc.PrefabInstance",
"fileId": "fen359pLtNwquH5hASoZLG",
"prefabRootNode": {
"__id__": 1
},
"mountedChildren": [],
"mountedComponents": [],
"propertyOverrides": [
{
"__id__": 76
},
{
"__id__": 78
},
{
"__id__": 79
},
{
"__id__": 80
},
{
"__id__": 81
}
],
"removedComponents": []
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 77
},
"propertyPath": [
"_name"
],
"value": "up_red"
},
{
"__type__": "cc.TargetInfo",
"localID": [
"c46/YsCPVOJYA4mWEpNYRx"
]
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 77
},
"propertyPath": [
"_lpos"
],
"value": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
}
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 77
},
"propertyPath": [
"_lrot"
],
"value": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
}
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 77
},
"propertyPath": [
"_euler"
],
"value": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
}
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 77
},
"propertyPath": [
"_active"
],
"value": true
},
{
"__type__": "cc.UITransform",
"_name": "",
@@ -1301,7 +661,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 83
"__id__": 38
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1329,7 +689,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 85
"__id__": 40
},
"anm": {
"__id__": 5
@@ -1350,7 +710,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 87
"__id__": 42
},
"debugMode": false,
"_id": ""
@@ -1369,7 +729,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 89
"__id__": 44
},
"enabledContactListener": true,
"bullet": false,
@@ -1403,7 +763,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 91
"__id__": 46
},
"tag": 0,
"_group": 4,
@@ -1439,21 +799,6 @@
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": [
{
"__id__": 73
},
{
"__id__": 64
},
{
"__id__": 55
},
{
"__id__": 46
},
{
"__id__": 37
},
{
"__id__": 26
},

10
assets/resources/game/heros/top.prefab
View File

@@ -702,13 +702,13 @@
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 52,
"g": 152,
"b": 219,
"r": 245,
"g": 255,
"b": 0,
"a": 255
},
"_spriteFrame": {
"__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@12034",
"__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@46c83",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 1,
@@ -1052,7 +1052,7 @@
"__id__": 28
},
"_mode": 0,
"_totalLength": 98,
"_totalLength": 100,
"_progress": 1,
"_reverse": false,
"_id": ""

135
assets/resources/game/skill/anm/buff/heathed.anim
View File

@@ -1,135 +0,0 @@
[
{
"__type__": "cc.AnimationClip",
"_name": "heath",
"_objFlags": 0,
"__editorExtras__": {
"embeddedPlayerGroups": []
},
"_native": "",
"sample": 18,
"speed": 1,
"wrapMode": 1,
"enableTrsBlending": false,
"_duration": 0.6111111111111112,
"_hash": 500763545,
"_tracks": [
{
"__id__": 1
}
],
"_exoticAnimation": null,
"_events": [],
"_embeddedPlayers": [],
"_additiveSettings": {
"__id__": 7
},
"_auxiliaryCurveEntries": []
},
{
"__type__": "cc.animation.ObjectTrack",
"_binding": {
"__type__": "cc.animation.TrackBinding",
"path": {
"__id__": 2
},
"proxy": null
},
"_channel": {
"__id__": 5
}
},
{
"__type__": "cc.animation.TrackPath",
"_paths": [
{
"__id__": 3
},
{
"__id__": 4
},
"spriteFrame"
]
},
{
"__type__": "cc.animation.HierarchyPath",
"path": "skill"
},
{
"__type__": "cc.animation.ComponentPath",
"component": "cc.Sprite"
},
{
"__type__": "cc.animation.Channel",
"_curve": {
"__id__": 6
}
},
{
"__type__": "cc.ObjectCurve",
"_times": [
0,
0.05555555555555555,
0.1111111111111111,
0.16666666666666666,
0.2222222222222222,
0.2777777777777778,
0.3333333333333333,
0.3888888888888889,
0.4444444444444444,
0.5,
0.5555555555555556
],
"_values": [
{
"__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@66538",
"__expectedType__": "cc.SpriteFrame"
},
{
"__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@4fa5c",
"__expectedType__": "cc.SpriteFrame"
},
{
"__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@18e34",
"__expectedType__": "cc.SpriteFrame"
},
{
"__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@fb0d3",
"__expectedType__": "cc.SpriteFrame"
},
{
"__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@e21f4",
"__expectedType__": "cc.SpriteFrame"
},
{
"__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@465e4",
"__expectedType__": "cc.SpriteFrame"
},
{
"__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@b1a60",
"__expectedType__": "cc.SpriteFrame"
},
{
"__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@61914",
"__expectedType__": "cc.SpriteFrame"
},
{
"__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@ae881",
"__expectedType__": "cc.SpriteFrame"
},
{
"__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@2bcdc",
"__expectedType__": "cc.SpriteFrame"
},
{
"__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@21da0",
"__expectedType__": "cc.SpriteFrame"
}
]
},
{
"__type__": "cc.AnimationClipAdditiveSettings",
"enabled": false,
"refClip": null
}
]

13
assets/resources/game/skill/anm/buff/heathed.anim.meta
View File

@@ -1,13 +0,0 @@
{
"ver": "2.0.3",
"importer": "animation-clip",
"imported": true,
"uuid": "43b4ca23-ea22-49e4-8faf-473edc7bb374",
"files": [
".cconb"
],
"subMetas": {},
"userData": {
"name": "heathed"
}
}