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

refactor(heroBox): 优化英雄升级弹窗展示与UI边框

Browse Source 
1.  移除英雄升级确认弹窗冗余的英雄名称变量拼接
2.  调整UI元素的边框偏移参数
3.  给英雄属性描述文本添加黑色描边优化显示效果
4.  更新了多个英雄预制件的节点ID与属性覆盖配置
This commit is contained in:
panFD
2026-08-10 10:28:39 +08:00
parent 2b3a68fb2a
commit 222dddbb05
6 changed files with 869 additions and 533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

968
assets/resources/common/prefab/window.prefab
View File

File diff suppressed because it is too large Load Diff

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

@@ -22,38 +22,38 @@
"__id__": 2
},
{
"__id__": 10
"__id__": 11
},
{
"__id__": 22
"__id__": 23
},
{
"__id__": 34
"__id__": 35
}
],
"_active": true,
"_components": [
{
"__id__": 45
"__id__": 46
},
{
"__id__": 47
"__id__": 48
},
{
"__id__": 49
"__id__": 50
},
{
"__id__": 51
"__id__": 52
},
{
"__id__": 53
"__id__": 54
},
{
"__id__": 55
"__id__": 56
}
],
"_prefab": {
"__id__": 57
"__id__": 58
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -130,6 +130,9 @@
},
{
"__id__": 9
},
{
"__id__": 10
}
],
"removedComponents": []
@@ -196,6 +199,16 @@
"z": 0
}
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 6
},
"propertyPath": [
"_active"
],
"value": false
},
{
"__type__": "cc.Node",
"_name": "anm",
@@ -208,23 +221,23 @@
"_active": true,
"_components": [
{
"__id__": 11
"__id__": 12
},
{
"__id__": 13
"__id__": 14
},
{
"__id__": 15
"__id__": 16
},
{
"__id__": 17
"__id__": 18
},
{
"__id__": 19
"__id__": 20
}
],
"_prefab": {
"__id__": 21
"__id__": 22
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -261,11 +274,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 10
"__id__": 11
},
"_enabled": true,
"__prefab": {
"__id__": 12
"__id__": 13
},
"_contentSize": {
"__type__": "cc.Size",
@@ -289,11 +302,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 10
"__id__": 11
},
"_enabled": true,
"__prefab": {
"__id__": 14
"__id__": 15
},
"_id": ""
},
@@ -307,11 +320,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 10
"__id__": 11
},
"_enabled": true,
"__prefab": {
"__id__": 16
"__id__": 17
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -355,11 +368,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 10
"__id__": 11
},
"_enabled": true,
"__prefab": {
"__id__": 18
"__id__": 19
},
"playOnLoad": true,
"_clips": [
@@ -397,11 +410,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 10
"__id__": 11
},
"_enabled": true,
"__prefab": {
"__id__": 20
"__id__": 21
},
"hitFlashMaterial": {
"__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810",
@@ -449,14 +462,14 @@
"__id__": 1
},
"_prefab": {
"__id__": 23
"__id__": 24
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 22
"__id__": 23
},
"asset": {
"__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -464,7 +477,7 @@
},
"fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": {
"__id__": 24
"__id__": 25
},
"targetOverrides": null
},
@@ -478,10 +491,7 @@
"mountedComponents": [],
"propertyOverrides": [
{
"__id__": 25
},
{
"__id__": 27
"__id__": 26
},
{
"__id__": 28
@@ -496,7 +506,10 @@
"__id__": 31
},
{
"__id__": 33
"__id__": 32
},
{
"__id__": 34
}
],
"removedComponents": []
@@ -504,7 +517,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 26
"__id__": 27
},
"propertyPath": [
"_name"
@@ -520,7 +533,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 26
"__id__": 27
},
"propertyPath": [
"_lpos"
@@ -535,7 +548,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 26
"__id__": 27
},
"propertyPath": [
"_lrot"
@@ -551,7 +564,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 26
"__id__": 27
},
"propertyPath": [
"_euler"
@@ -566,7 +579,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 26
"__id__": 27
},
"propertyPath": [
"_active"
@@ -576,7 +589,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 32
"__id__": 33
},
"propertyPath": [
"_contentSize"
@@ -596,7 +609,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 26
"__id__": 27
},
"propertyPath": [
"_lscale"
@@ -615,14 +628,14 @@
"__id__": 1
},
"_prefab": {
"__id__": 35
"__id__": 36
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 34
"__id__": 35
},
"asset": {
"__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -630,7 +643,7 @@
},
"fileId": "5fqU0L3/FOhKaco5UkHuWT",
"instance": {
"__id__": 36
"__id__": 37
},
"targetOverrides": null
},
@@ -644,10 +657,7 @@
"mountedComponents": [],
"propertyOverrides": [
{
"__id__": 37
},
{
"__id__": 39
"__id__": 38
},
{
"__id__": 40
@@ -659,7 +669,10 @@
"__id__": 42
},
{
"__id__": 44
"__id__": 43
},
{
"__id__": 45
}
],
"removedComponents": []
@@ -667,7 +680,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 38
"__id__": 39
},
"propertyPath": [
"_name"
@@ -683,7 +696,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 38
"__id__": 39
},
"propertyPath": [
"_lpos"
@@ -698,7 +711,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 38
"__id__": 39
},
"propertyPath": [
"_lrot"
@@ -714,7 +727,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 38
"__id__": 39
},
"propertyPath": [
"_euler"
@@ -729,7 +742,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 43
"__id__": 44
},
"propertyPath": [
"_lpos"
@@ -750,7 +763,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 38
"__id__": 39
},
"propertyPath": [
"_lscale"
@@ -772,7 +785,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 46
"__id__": 47
},
"_contentSize": {
"__type__": "cc.Size",
@@ -800,10 +813,10 @@
},
"_enabled": true,
"__prefab": {
"__id__": 48
"__id__": 49
},
"anm": {
"__id__": 13
"__id__": 14
},
"_id": ""
},
@@ -821,7 +834,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 50
"__id__": 51
},
"debugMode": false,
"_id": ""
@@ -840,7 +853,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 52
"__id__": 53
},
"enabledContactListener": true,
"bullet": false,
@@ -874,7 +887,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 54
"__id__": 55
},
"tag": 0,
"_group": 4,
@@ -908,7 +921,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 56
"__id__": 57
},
"playOnLoad": false,
"_clips": [],
@@ -932,10 +945,10 @@
"targetOverrides": null,
"nestedPrefabInstanceRoots": [
{
"__id__": 34
"__id__": 35
},
{
"__id__": 22
"__id__": 23
},
{
"__id__": 2

137
assets/resources/game/heros/ha2.prefab
View File

@@ -22,35 +22,35 @@
"__id__": 2
},
{
"__id__": 10
"__id__": 11
},
{
"__id__": 22
"__id__": 23
},
{
"__id__": 34
"__id__": 35
}
],
"_active": true,
"_components": [
{
"__id__": 45
"__id__": 46
},
{
"__id__": 47
"__id__": 48
},
{
"__id__": 49
"__id__": 50
},
{
"__id__": 51
"__id__": 52
},
{
"__id__": 53
"__id__": 54
}
],
"_prefab": {
"__id__": 55
"__id__": 56
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -127,6 +127,9 @@
},
{
"__id__": 9
},
{
"__id__": 10
}
],
"removedComponents": []
@@ -193,6 +196,16 @@
"z": 0
}
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 6
},
"propertyPath": [
"_active"
],
"value": false
},
{
"__type__": "cc.Node",
"_name": "anm",
@@ -205,23 +218,23 @@
"_active": true,
"_components": [
{
"__id__": 11
"__id__": 12
},
{
"__id__": 13
"__id__": 14
},
{
"__id__": 15
"__id__": 16
},
{
"__id__": 17
"__id__": 18
},
{
"__id__": 19
"__id__": 20
}
],
"_prefab": {
"__id__": 21
"__id__": 22
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -258,11 +271,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 10
"__id__": 11
},
"_enabled": true,
"__prefab": {
"__id__": 12
"__id__": 13
},
"_contentSize": {
"__type__": "cc.Size",
@@ -286,11 +299,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 10
"__id__": 11
},
"_enabled": true,
"__prefab": {
"__id__": 14
"__id__": 15
},
"_id": ""
},
@@ -304,11 +317,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 10
"__id__": 11
},
"_enabled": true,
"__prefab": {
"__id__": 16
"__id__": 17
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -352,11 +365,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 10
"__id__": 11
},
"_enabled": true,
"__prefab": {
"__id__": 18
"__id__": 19
},
"hitFlashMaterial": {
"__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810",
@@ -390,11 +403,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 10
"__id__": 11
},
"_enabled": true,
"__prefab": {
"__id__": 20
"__id__": 21
},
"playOnLoad": false,
"_clips": [
@@ -446,14 +459,14 @@
"__id__": 1
},
"_prefab": {
"__id__": 23
"__id__": 24
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 22
"__id__": 23
},
"asset": {
"__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -461,7 +474,7 @@
},
"fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": {
"__id__": 24
"__id__": 25
},
"targetOverrides": null
},
@@ -475,10 +488,7 @@
"mountedComponents": [],
"propertyOverrides": [
{
"__id__": 25
},
{
"__id__": 27
"__id__": 26
},
{
"__id__": 28
@@ -493,7 +503,10 @@
"__id__": 31
},
{
"__id__": 33
"__id__": 32
},
{
"__id__": 34
}
],
"removedComponents": []
@@ -501,7 +514,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 26
"__id__": 27
},
"propertyPath": [
"_name"
@@ -517,7 +530,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 26
"__id__": 27
},
"propertyPath": [
"_lpos"
@@ -532,7 +545,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 26
"__id__": 27
},
"propertyPath": [
"_lrot"
@@ -548,7 +561,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 26
"__id__": 27
},
"propertyPath": [
"_euler"
@@ -563,7 +576,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 26
"__id__": 27
},
"propertyPath": [
"_active"
@@ -573,7 +586,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 32
"__id__": 33
},
"propertyPath": [
"_contentSize"
@@ -593,7 +606,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 26
"__id__": 27
},
"propertyPath": [
"_lscale"
@@ -612,14 +625,14 @@
"__id__": 1
},
"_prefab": {
"__id__": 35
"__id__": 36
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 34
"__id__": 35
},
"asset": {
"__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -627,7 +640,7 @@
},
"fileId": "5fqU0L3/FOhKaco5UkHuWT",
"instance": {
"__id__": 36
"__id__": 37
},
"targetOverrides": null
},
@@ -641,10 +654,7 @@
"mountedComponents": [],
"propertyOverrides": [
{
"__id__": 37
},
{
"__id__": 39
"__id__": 38
},
{
"__id__": 40
@@ -656,7 +666,10 @@
"__id__": 42
},
{
"__id__": 44
"__id__": 43
},
{
"__id__": 45
}
],
"removedComponents": []
@@ -664,7 +677,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 38
"__id__": 39
},
"propertyPath": [
"_name"
@@ -680,7 +693,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 38
"__id__": 39
},
"propertyPath": [
"_lpos"
@@ -695,7 +708,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 38
"__id__": 39
},
"propertyPath": [
"_lrot"
@@ -711,7 +724,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 38
"__id__": 39
},
"propertyPath": [
"_euler"
@@ -726,7 +739,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 43
"__id__": 44
},
"propertyPath": [
"_lpos"
@@ -747,7 +760,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 38
"__id__": 39
},
"propertyPath": [
"_lscale"
@@ -769,7 +782,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 46
"__id__": 47
},
"_contentSize": {
"__type__": "cc.Size",
@@ -797,10 +810,10 @@
},
"_enabled": true,
"__prefab": {
"__id__": 48
"__id__": 49
},
"anm": {
"__id__": 13
"__id__": 14
},
"_id": ""
},
@@ -818,7 +831,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 50
"__id__": 51
},
"debugMode": false,
"_id": ""
@@ -837,7 +850,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 52
"__id__": 53
},
"enabledContactListener": true,
"bullet": false,
@@ -871,7 +884,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 54
"__id__": 55
},
"tag": 0,
"_group": 4,
@@ -908,10 +921,10 @@
"targetOverrides": null,
"nestedPrefabInstanceRoots": [
{
"__id__": 34
"__id__": 35
},
{
"__id__": 22
"__id__": 23
},
{
"__id__": 2

141
assets/resources/game/heros/ha3.prefab
View File

@@ -22,38 +22,38 @@
"__id__": 2
},
{
"__id__": 10
"__id__": 11
},
{
"__id__": 22
"__id__": 23
},
{
"__id__": 34
"__id__": 35
}
],
"_active": true,
"_components": [
{
"__id__": 45
"__id__": 46
},
{
"__id__": 47
"__id__": 48
},
{
"__id__": 49
"__id__": 50
},
{
"__id__": 51
"__id__": 52
},
{
"__id__": 53
"__id__": 54
},
{
"__id__": 55
"__id__": 56
}
],
"_prefab": {
"__id__": 57
"__id__": 58
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -130,6 +130,9 @@
},
{
"__id__": 9
},
{
"__id__": 10
}
],
"removedComponents": []
@@ -196,6 +199,16 @@
"z": 0
}
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 6
},
"propertyPath": [
"_active"
],
"value": false
},
{
"__type__": "cc.Node",
"_name": "anm",
@@ -208,23 +221,23 @@
"_active": true,
"_components": [
{
"__id__": 11
"__id__": 12
},
{
"__id__": 13
"__id__": 14
},
{
"__id__": 15
"__id__": 16
},
{
"__id__": 17
"__id__": 18
},
{
"__id__": 19
"__id__": 20
}
],
"_prefab": {
"__id__": 21
"__id__": 22
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -261,11 +274,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 10
"__id__": 11
},
"_enabled": true,
"__prefab": {
"__id__": 12
"__id__": 13
},
"_contentSize": {
"__type__": "cc.Size",
@@ -289,11 +302,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 10
"__id__": 11
},
"_enabled": true,
"__prefab": {
"__id__": 14
"__id__": 15
},
"_id": ""
},
@@ -307,11 +320,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 10
"__id__": 11
},
"_enabled": true,
"__prefab": {
"__id__": 16
"__id__": 17
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -355,11 +368,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 10
"__id__": 11
},
"_enabled": true,
"__prefab": {
"__id__": 18
"__id__": 19
},
"hitFlashMaterial": {
"__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810",
@@ -393,11 +406,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 10
"__id__": 11
},
"_enabled": true,
"__prefab": {
"__id__": 20
"__id__": 21
},
"playOnLoad": false,
"_clips": [
@@ -452,14 +465,14 @@
"__id__": 1
},
"_prefab": {
"__id__": 23
"__id__": 24
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 22
"__id__": 23
},
"asset": {
"__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -467,7 +480,7 @@
},
"fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": {
"__id__": 24
"__id__": 25
},
"targetOverrides": null
},
@@ -481,10 +494,7 @@
"mountedComponents": [],
"propertyOverrides": [
{
"__id__": 25
},
{
"__id__": 27
"__id__": 26
},
{
"__id__": 28
@@ -499,7 +509,10 @@
"__id__": 31
},
{
"__id__": 33
"__id__": 32
},
{
"__id__": 34
}
],
"removedComponents": []
@@ -507,7 +520,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 26
"__id__": 27
},
"propertyPath": [
"_name"
@@ -523,7 +536,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 26
"__id__": 27
},
"propertyPath": [
"_lpos"
@@ -538,7 +551,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 26
"__id__": 27
},
"propertyPath": [
"_lrot"
@@ -554,7 +567,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 26
"__id__": 27
},
"propertyPath": [
"_euler"
@@ -569,7 +582,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 26
"__id__": 27
},
"propertyPath": [
"_active"
@@ -579,7 +592,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 32
"__id__": 33
},
"propertyPath": [
"_contentSize"
@@ -599,7 +612,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 26
"__id__": 27
},
"propertyPath": [
"_lscale"
@@ -618,14 +631,14 @@
"__id__": 1
},
"_prefab": {
"__id__": 35
"__id__": 36
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 34
"__id__": 35
},
"asset": {
"__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -633,7 +646,7 @@
},
"fileId": "5fqU0L3/FOhKaco5UkHuWT",
"instance": {
"__id__": 36
"__id__": 37
},
"targetOverrides": null
},
@@ -647,10 +660,7 @@
"mountedComponents": [],
"propertyOverrides": [
{
"__id__": 37
},
{
"__id__": 39
"__id__": 38
},
{
"__id__": 40
@@ -662,7 +672,10 @@
"__id__": 42
},
{
"__id__": 44
"__id__": 43
},
{
"__id__": 45
}
],
"removedComponents": []
@@ -670,7 +683,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 38
"__id__": 39
},
"propertyPath": [
"_name"
@@ -686,7 +699,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 38
"__id__": 39
},
"propertyPath": [
"_lpos"
@@ -701,7 +714,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 38
"__id__": 39
},
"propertyPath": [
"_lrot"
@@ -717,7 +730,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 38
"__id__": 39
},
"propertyPath": [
"_euler"
@@ -732,7 +745,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 43
"__id__": 44
},
"propertyPath": [
"_lpos"
@@ -753,7 +766,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 38
"__id__": 39
},
"propertyPath": [
"_lscale"
@@ -775,7 +788,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 46
"__id__": 47
},
"_contentSize": {
"__type__": "cc.Size",
@@ -803,10 +816,10 @@
},
"_enabled": true,
"__prefab": {
"__id__": 48
"__id__": 49
},
"anm": {
"__id__": 13
"__id__": 14
},
"_id": ""
},
@@ -824,7 +837,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 50
"__id__": 51
},
"debugMode": false,
"_id": ""
@@ -843,7 +856,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 52
"__id__": 53
},
"enabledContactListener": true,
"bullet": false,
@@ -877,7 +890,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 54
"__id__": 55
},
"tag": 0,
"_group": 4,
@@ -911,7 +924,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 56
"__id__": 57
},
"playOnLoad": false,
"_clips": [],
@@ -935,10 +948,10 @@
"targetOverrides": null,
"nestedPrefabInstanceRoots": [
{
"__id__": 34
"__id__": 35
},
{
"__id__": 22
"__id__": 23
},
{
"__id__": 2

8
assets/resources/gui/ui3.plist.meta
View File

@@ -300,10 +300,10 @@
"height": 63,
"rawWidth": 54,
"rawHeight": 63,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"borderTop": 30,
"borderBottom": 33,
"borderLeft": 27,
"borderRight": 27,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,

7
assets/script/game/map/HeroBoxComp.ts
View File

@@ -172,7 +172,6 @@ export class HeroBoxComp extends CCComp {
}
oops.audio.playEffect("music/button");
const heroName = this.model.hero_name ?? "";
const nextLv = heroLv + 1;
const cost = MissionEconomy.getUpgradeCost(heroLv);
// 金币不足：smalltip 气泡提示（挂载金币节点），不弹确认框
@@ -185,7 +184,7 @@ export class HeroBoxComp extends CCComp {
// oops.gui 公共确认窗口（自定义 CommonPrompt：内容支持富文本高亮）
oops.gui.open(UIID.Window, {
title: `升级英雄`,
content: `<color=#C0392B>${heroName}</color> Lv.${heroLv} → <color=#1E8449>Lv.${nextLv}</color>\n消耗 <color=#E67E22>${cost}</color> 金币\n\n${preview}`,
content: preview,
okWord: "升级",
cancelWord: "取消",
needCancel: true,
@@ -241,7 +240,7 @@ export class HeroBoxComp extends CCComp {
const curDesc = buildSkillDescMoreRich(buildSource(heroLv));
const nextDesc = buildSkillDescMoreRich(buildSource(nextLv));
return [
return `<outline color=#000000 width=2>` + [
`<b>当前 Lv.${heroLv}：</b>`,
attrLine(heroLv),
curDesc,
@@ -249,7 +248,7 @@ export class HeroBoxComp extends CCComp {
`<b>升级后 Lv.${nextLv}：</b>`,
attrLine(nextLv),
nextDesc,
].filter(s => s !== undefined).join("\n");
].filter(s => s !== undefined).join("\n") + `</outline>`;
}
/** 累加等级额外加成（≤目标等级的所有档位） */