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

refactor: 统一替换内置console日志为可配置化日志系统

Browse Source 
1.  将各业务模块中的硬编码console日志替换为自定义Logger模块，新增DEBUG开关控制日志输出
2.  为MissSkillsComp新增道具卡牌使用处理逻辑，支持药水类技能直接给全队施加buff
3.  修复了道具卡牌事件监听绑定错误的问题
4.  新增了hero预制体的meta配置文件
5.  调整了装备预制体的UI布局参数
This commit is contained in:
panFD
2026-07-23 23:58:06 +08:00
parent ac0891ccdd
commit b3efb06894
10 changed files with 9296 additions and 5176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

383
assets/resources/gui/element/equip.prefab
View File

@@ -31,29 +31,29 @@
"__id__": 64 "__id__": 64
}, },
{ {
"__id__": 90 "__id__": 96
}, },
{ {
"__id__": 98 "__id__": 104
}, },
{ {
"__id__": 116 "__id__": 122
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 132 "__id__": 138
}, },
{ {
"__id__": 134 "__id__": 140
}, },
{ {
"__id__": 136 "__id__": 142
} }
], ],
"_prefab": { "_prefab": {
"__id__": 144 "__id__": 150
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -215,7 +215,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 714, "width": 714,
"height": 94 "height": 114
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@@ -565,7 +565,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 712, "width": 712,
"height": 91 "height": 111
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@@ -740,7 +740,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 720, "width": 720,
"height": 100 "height": 120
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@@ -862,7 +862,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 720, "width": 720,
"height": 100 "height": 120
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@@ -1023,7 +1023,7 @@
}, },
"_alignFlags": 8, "_alignFlags": 8,
"_target": null, "_target": null,
"_left": 10.696000000000026, "_left": 13.908000000000015,
"_right": 0, "_right": 0,
"_top": 0, "_top": 0,
"_bottom": 0, "_bottom": 0,
@@ -1071,8 +1071,8 @@
], ],
"value": { "value": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": -309.304, "x": -306.092,
"y": 0, "y": 2.693,
"z": 0 "z": 0
} }
}, },
@@ -1171,8 +1171,8 @@
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": -271.748, "x": -265.787,
"y": 16.571, "y": 38.564,
"z": 0 "z": 0
}, },
"_lrot": { "_lrot": {
@@ -1212,7 +1212,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 104, "width": 84,
"height": 54.4 "height": 54.4
}, },
"_anchorPoint": { "_anchorPoint": {
@@ -1251,8 +1251,8 @@
"_string": "武器名称", "_string": "武器名称",
"_horizontalAlign": 0, "_horizontalAlign": 0,
"_verticalAlign": 1, "_verticalAlign": 1,
"_actualFontSize": 25, "_actualFontSize": 20,
"_fontSize": 25, "_fontSize": 20,
"_fontFamily": "Arial", "_fontFamily": "Arial",
"_lineHeight": 40, "_lineHeight": 40,
"_overflow": 0, "_overflow": 0,
@@ -1308,7 +1308,7 @@
}, },
"_alignFlags": 8, "_alignFlags": 8,
"_target": null, "_target": null,
"_left": 88.25200000000001, "_left": 94.21300000000002,
"_right": 0, "_right": 0,
"_top": 0, "_top": 0,
"_bottom": 0, "_bottom": 0,
@@ -1356,31 +1356,31 @@
"__id__": 65 "__id__": 65
}, },
{ {
"__id__": 71 "__id__": 73
}, },
{ {
"__id__": 77 "__id__": 81
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 83 "__id__": 89
}, },
{ {
"__id__": 85 "__id__": 91
}, },
{ {
"__id__": 87 "__id__": 93
} }
], ],
"_prefab": { "_prefab": {
"__id__": 89 "__id__": 95
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": -160, "x": -265,
"y": 0, "y": -11.445000000000007,
"z": 0 "z": 0
}, },
"_lrot": { "_lrot": {
@@ -1422,10 +1422,13 @@
}, },
{ {
"__id__": 68 "__id__": 68
},
{
"__id__": 70
} }
], ],
"_prefab": { "_prefab": {
"__id__": 70 "__id__": 72
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -1470,7 +1473,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 300, "width": 500,
"height": 23.333333333333332 "height": 23.333333333333332
}, },
"_anchorPoint": { "_anchorPoint": {
@@ -1552,6 +1555,42 @@
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "b5sZHO3gNIW76AXUeqZYBn" "fileId": "b5sZHO3gNIW76AXUeqZYBn"
}, },
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 65
},
"_enabled": true,
"__prefab": {
"__id__": 71
},
"_alignFlags": 40,
"_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": 300,
"_originalHeight": 0,
"_alignMode": 2,
"_lockFlags": 0,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "90OrNvrelLZbOIOrrDJnEv"
},
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
@@ -1577,14 +1616,17 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 72 "__id__": 74
}, },
{ {
"__id__": 74 "__id__": 76
},
{
"__id__": 78
} }
], ],
"_prefab": { "_prefab": {
"__id__": 76 "__id__": 80
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -1621,15 +1663,15 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 71 "__id__": 73
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 73 "__id__": 75
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 300, "width": 500,
"height": 23.333333333333332 "height": 23.333333333333332
}, },
"_anchorPoint": { "_anchorPoint": {
@@ -1649,11 +1691,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 71 "__id__": 73
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 75 "__id__": 77
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
@@ -1711,6 +1753,42 @@
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "dc6KYeWoJBr5NspO5kGx92" "fileId": "dc6KYeWoJBr5NspO5kGx92"
}, },
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 73
},
"_enabled": true,
"__prefab": {
"__id__": 79
},
"_alignFlags": 40,
"_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": 300,
"_originalHeight": 0,
"_alignMode": 2,
"_lockFlags": 0,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "ecZYYEuDRAh5fCYP3KMUKj"
},
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
@@ -1736,14 +1814,17 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 78 "__id__": 82
}, },
{ {
"__id__": 80 "__id__": 84
},
{
"__id__": 86
} }
], ],
"_prefab": { "_prefab": {
"__id__": 82 "__id__": 88
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -1780,15 +1861,15 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 77 "__id__": 81
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 79 "__id__": 83
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 300, "width": 500,
"height": 23.333333333333332 "height": 23.333333333333332
}, },
"_anchorPoint": { "_anchorPoint": {
@@ -1808,11 +1889,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 77 "__id__": 81
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 81 "__id__": 85
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
@@ -1870,6 +1951,42 @@
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "f0oseF23FJJY7bo5zkXU/L" "fileId": "f0oseF23FJJY7bo5zkXU/L"
}, },
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 81
},
"_enabled": true,
"__prefab": {
"__id__": 87
},
"_alignFlags": 40,
"_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": 300,
"_originalHeight": 0,
"_alignMode": 2,
"_lockFlags": 0,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "7dc/Tc5s5N+42zkFkChZxc"
},
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
@@ -1893,11 +2010,11 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 84 "__id__": 90
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 420, "width": 500,
"height": 70 "height": 70
}, },
"_anchorPoint": { "_anchorPoint": {
@@ -1921,14 +2038,14 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 86 "__id__": 92
}, },
"_alignFlags": 45, "_alignFlags": 45,
"_target": null, "_target": null,
"_left": 200, "_left": 95,
"_right": 100, "_right": 125,
"_top": 15, "_top": 36.445,
"_bottom": 15, "_bottom": 13.554999999999996,
"_horizontalCenter": 0, "_horizontalCenter": 0,
"_verticalCenter": 0, "_verticalCenter": 0,
"_isAbsLeft": true, "_isAbsLeft": true,
@@ -1957,7 +2074,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 88 "__id__": 94
}, },
"_resizeMode": 1, "_resizeMode": 1,
"_layoutType": 2, "_layoutType": 2,
@@ -2010,22 +2127,22 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 91 "__id__": 97
}, },
{ {
"__id__": 93 "__id__": 99
}, },
{ {
"__id__": 95 "__id__": 101
} }
], ],
"_prefab": { "_prefab": {
"__id__": 97 "__id__": 103
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": -246.42299999999997, "x": -150.389,
"y": -14.317, "y": 39.317,
"z": 0 "z": 0
}, },
"_lrot": { "_lrot": {
@@ -2057,11 +2174,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 90 "__id__": 96
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 92 "__id__": 98
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@@ -2085,11 +2202,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 90 "__id__": 96
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 94 "__id__": 100
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
@@ -2153,15 +2270,15 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 90 "__id__": 96
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 96 "__id__": 102
}, },
"_alignFlags": 8, "_alignFlags": 8,
"_target": null, "_target": null,
"_left": 91.2922546983011, "_left": 187.32625469830108,
"_right": 0, "_right": 0,
"_top": 0, "_top": 0,
"_bottom": 0, "_bottom": 0,
@@ -2206,20 +2323,20 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 99 "__id__": 105
}, },
{ {
"__id__": 107 "__id__": 113
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 113 "__id__": 119
} }
], ],
"_prefab": { "_prefab": {
"__id__": 115 "__id__": 121
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -2256,23 +2373,23 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 98 "__id__": 104
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 100 "__id__": 106
}, },
{ {
"__id__": 102 "__id__": 108
}, },
{ {
"__id__": 104 "__id__": 110
} }
], ],
"_prefab": { "_prefab": {
"__id__": 106 "__id__": 112
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -2309,11 +2426,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 99 "__id__": 105
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 101 "__id__": 107
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@@ -2337,11 +2454,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 99 "__id__": 105
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 103 "__id__": 109
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
@@ -2382,11 +2499,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 99 "__id__": 105
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 105 "__id__": 111
}, },
"_alignFlags": 45, "_alignFlags": 45,
"_target": null, "_target": null,
@@ -2431,20 +2548,20 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 98 "__id__": 104
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 108 "__id__": 114
}, },
{ {
"__id__": 110 "__id__": 116
} }
], ],
"_prefab": { "_prefab": {
"__id__": 112 "__id__": 118
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -2481,11 +2598,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 107 "__id__": 113
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 109 "__id__": 115
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@@ -2509,11 +2626,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 107 "__id__": 113
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 111 "__id__": 117
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
@@ -2590,11 +2707,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 98 "__id__": 104
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 114 "__id__": 120
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@@ -2635,20 +2752,20 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 117 "__id__": 123
}, },
{ {
"__id__": 123 "__id__": 129
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 129 "__id__": 135
} }
], ],
"_prefab": { "_prefab": {
"__id__": 131 "__id__": 137
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -2685,20 +2802,20 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 116 "__id__": 122
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 118 "__id__": 124
}, },
{ {
"__id__": 120 "__id__": 126
} }
], ],
"_prefab": { "_prefab": {
"__id__": 122 "__id__": 128
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -2735,11 +2852,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 117 "__id__": 123
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 119 "__id__": 125
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@@ -2763,11 +2880,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 117 "__id__": 123
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 121 "__id__": 127
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
@@ -2821,20 +2938,20 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 116 "__id__": 122
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 124 "__id__": 130
}, },
{ {
"__id__": 126 "__id__": 132
} }
], ],
"_prefab": { "_prefab": {
"__id__": 128 "__id__": 134
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -2871,11 +2988,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 123 "__id__": 129
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 125 "__id__": 131
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@@ -2899,11 +3016,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 123 "__id__": 129
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 127 "__id__": 133
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
@@ -2980,11 +3097,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 116 "__id__": 122
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 130 "__id__": 136
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@@ -3025,12 +3142,12 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 133 "__id__": 139
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 720, "width": 720,
"height": 100 "height": 120
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@@ -3053,7 +3170,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 135 "__id__": 141
}, },
"_alignFlags": 40, "_alignFlags": 40,
"_target": null, "_target": null,
@@ -3089,10 +3206,10 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 137 "__id__": 143
}, },
"icon_node": { "icon_node": {
"__id__": 138 "__id__": 144
}, },
"bg_node": null, "bg_node": null,
"name_label": { "name_label": {
@@ -3102,16 +3219,16 @@
"__id__": 68 "__id__": 68
}, },
"fied2": { "fied2": {
"__id__": 74 "__id__": 76
}, },
"fied3": { "fied3": {
"__id__": 80 "__id__": 84
}, },
"level_label": { "level_label": {
"__id__": 93 "__id__": 99
}, },
"buy_node": { "buy_node": {
"__id__": 98 "__id__": 104
}, },
"_id": "" "_id": ""
}, },
@@ -3131,14 +3248,14 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 139 "__id__": 145
}, },
{ {
"__id__": 141 "__id__": 147
} }
], ],
"_prefab": { "_prefab": {
"__id__": 143 "__id__": 149
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -3175,11 +3292,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 138 "__id__": 144
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 140 "__id__": 146
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@@ -3203,11 +3320,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 138 "__id__": 144
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 142 "__id__": 148
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
@@ -3270,7 +3387,7 @@
"instance": null, "instance": null,
"targetOverrides": [ "targetOverrides": [
{ {
"__id__": 145 "__id__": 151
} }
], ],
"nestedPrefabInstanceRoots": [ "nestedPrefabInstanceRoots": [
@@ -3282,7 +3399,7 @@
{ {
"__type__": "cc.TargetOverrideInfo", "__type__": "cc.TargetOverrideInfo",
"source": { "source": {
"__id__": 136 "__id__": 142
}, },
"sourceInfo": null, "sourceInfo": null,
"propertyPath": [ "propertyPath": [
@@ -3292,7 +3409,7 @@
"__id__": 40 "__id__": 40
}, },
"targetInfo": { "targetInfo": {
"__id__": 146 "__id__": 152
} }
}, },
{ {

3782
assets/resources/gui/element/hero.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

13
assets/resources/gui/element/hero.prefab.meta Normal file
View File

@@ -0,0 +1,13 @@
{
"ver": "1.1.50",
"importer": "prefab",
"imported": true,
"uuid": "f820a186-b9f6-44df-a534-bdcbaa6a639a",
"files": [
".json"
],
"subMetas": {},
"userData": {
"syncNodeName": "hero"
}
}

9204
assets/resources/gui/element/mission.prefab
View File

File diff suppressed because it is too large Load Diff

1019
assets/resources/gui/role_controller.prefab
View File

File diff suppressed because it is too large Load Diff

8
assets/script/game/hero/BuffManager.ts
View File

@@ -11,6 +11,10 @@
import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS"; import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS";
import { BuffCategory, BuffList } from "../common/config/BuffSet"; import { BuffCategory, BuffList } from "../common/config/BuffSet";
import { BuffComp, ActiveBuff } from "./BuffComp"; import { BuffComp, ActiveBuff } from "./BuffComp";
import { mLogger } from "../common/Logger";
/** Buff 模块调试日志开关 */
const DEBUG = false;
/** applyBuff 的覆盖参数（预留按需覆写持续时间 / 修饰数值） */ /** applyBuff 的覆盖参数（预留按需覆写持续时间 / 修饰数值） */
export interface BuffApplyOverrides { export interface BuffApplyOverrides {
@@ -37,10 +41,10 @@ class BuffManagerImpl {
applyBuff(target: ecs.Entity, buffId: number, sourceUuid: number = 0, sourceAp: number = 0, overrides?: BuffApplyOverrides): void { applyBuff(target: ecs.Entity, buffId: number, sourceUuid: number = 0, sourceAp: number = 0, overrides?: BuffApplyOverrides): void {
const cfg = BuffList[buffId]; const cfg = BuffList[buffId];
if (!cfg) { if (!cfg) {
console.log(`[BuffManager] applyBuff: buffId=${buffId} 配置不存在，跳过`); mLogger.warn(true, "BuffManager", `applyBuff: buffId=${buffId} 配置不存在，跳过`);
return; return;
} }
console.log(`[BuffManager] applyBuff: buff=${cfg.name}(${buffId}) target_eid=${target.eid} duration=${overrides?.duration ?? cfg.duration} value_override=${overrides?.value} source_ap=${sourceAp}`); mLogger.log(DEBUG, "BuffManager", `applyBuff: buff=${cfg.name}(${buffId}) target_eid=${target.eid} duration=${overrides?.duration ?? cfg.duration} value_override=${overrides?.value} source_ap=${sourceAp}`);
const buffComp = this.ensureBuffComp(target); const buffComp = this.ensureBuffComp(target);
const duration = overrides?.duration ?? cfg.duration; const duration = overrides?.duration ?? cfg.duration;

6
assets/script/game/hero/BuffSystem.ts
View File

@@ -15,6 +15,10 @@ import { Timer } from "db://oops-framework/core/common/timer/Timer";
import { BuffList } from "../common/config/BuffSet"; import { BuffList } from "../common/config/BuffSet";
import { HeroAttrsComp } from "./HeroAttrsComp"; import { HeroAttrsComp } from "./HeroAttrsComp";
import { BuffComp, ActiveBuff } from "./BuffComp"; import { BuffComp, ActiveBuff } from "./BuffComp";
import { mLogger } from "../common/Logger";
/** Buff 模块调试日志开关 */
const DEBUG = false;
/** 固定步长（秒） */ /** 固定步长（秒） */
const TICK_STEP = 0.1; const TICK_STEP = 0.1;
@@ -60,7 +64,7 @@ export class BuffSystem extends ecs.ComblockSystem implements ecs.ISystemUpdate
if (cfg.duration > 0 && layer.remaining <= 0) { if (cfg.duration > 0 && layer.remaining <= 0) {
layers.splice(i, 1); layers.splice(i, 1);
anyChanged = true; anyChanged = true;
console.log(`[BuffSystem] buff 到期移除: ${cfg.name}(${buffId}) eid=${e.eid} 剩余层数=${layers.length}`); mLogger.log(DEBUG, "BuffSystem", `buff 到期移除: ${cfg.name}(${buffId}) eid=${e.eid} 剩余层数=${layers.length}`);
} }
} }

6
assets/script/game/hero/HeroAttrsComp.ts
View File

@@ -355,7 +355,7 @@ export class HeroAttrsComp extends ecs.Comp {
for (const mod of cfg.modifiers) { for (const mod of cfg.modifiers) {
if (mod.attr !== attr) continue; if (mod.attr !== attr) continue;
const value = layerVal !== undefined ? layerVal : mod.value; const value = layerVal !== undefined ? layerVal : mod.value;
console.log(`[HeroAttrs] aggregateTimedMods 命中: ${this.hero_name} buff=${cfg.name} attr=${attr} op=${mod.op} value=${value} remaining=${layers[i].remaining.toFixed(1)}`); mLogger.log(this.debugMode, "HeroAttrs", `aggregateTimedMods 命中: ${this.hero_name} buff=${cfg.name} attr=${attr} op=${mod.op} value=${value} remaining=${layers[i].remaining.toFixed(1)}`);
if (mod.op === ModOp.Flat) { if (mod.op === ModOp.Flat) {
result.flatSum += value; result.flatSum += value;
} else { } else {
@@ -377,8 +377,8 @@ export class HeroAttrsComp extends ecs.Comp {
const runtimeAp = this.getRuntimeAp(this.ap); const runtimeAp = this.getRuntimeAp(this.ap);
const mods = this.aggregateTimedMods(Attrs.ap); const mods = this.aggregateTimedMods(Attrs.ap);
const final = (runtimeAp + mods.flatSum) * (1 + mods.pctSum / 100); const final = (runtimeAp + mods.flatSum) * (1 + mods.pctSum / 100);
if (mods.flatSum !== 0 || mods.pctSum !== 0) { if (this.debugMode && (mods.flatSum !== 0 || mods.pctSum !== 0)) {
console.log(`[HeroAttrs] getFinalAp: ${this.hero_name} base=${this.ap} runtime=${runtimeAp.toFixed(1)} flat=${mods.flatSum} pct=${mods.pctSum} final=${final.toFixed(1)}`); mLogger.log(this.debugMode, "HeroAttrs", `getFinalAp: ${this.hero_name} base=${this.ap} runtime=${runtimeAp.toFixed(1)} flat=${mods.flatSum} pct=${mods.pctSum} final=${final.toFixed(1)}`);
} }
return final; return final;
} }

7
assets/script/game/hero/SCastSystem.ts
View File

@@ -13,6 +13,7 @@ import { GameEvent } from "../common/config/GameEvent";
import { SkillTriggerType } from "../common/config/heroSet"; import { SkillTriggerType } from "../common/config/heroSet";
import { SkillTriggerHelper } from "./SkillTriggerHelper"; import { SkillTriggerHelper } from "./SkillTriggerHelper";
import { MissionEconomy } from "../map/MissionEconomy"; import { MissionEconomy } from "../map/MissionEconomy";
import { mLogger } from "../common/Logger";
import { MissionHeroComp } from "../map/MissionHeroComp"; import { MissionHeroComp } from "../map/MissionHeroComp";
import { buffManager } from "./BuffManager"; import { buffManager } from "./BuffManager";
@@ -142,11 +143,11 @@ export class SCastSystem extends ecs.ComblockSystem implements ecs.ISystemUpdate
} }
} }
console.log("[SCastSystem] forceCastCardSkill: casting skill", s_uuid, "castTimes", castTimes, "targetPos", targetPos, "isFriendly", isFriendly, "buff_value", config.buff_value, "timed_buff_id", config.timed_buff_id); mLogger.log(this.debugMode, "SCastSystem", "forceCastCardSkill: casting skill", s_uuid, "castTimes", castTimes, "targetPos", targetPos, "isFriendly", isFriendly, "buff_value", config.buff_value, "timed_buff_id", config.timed_buff_id);
for (let i = 0; i < castTimes; i++) { for (let i = 0; i < castTimes; i++) {
if (isFriendly) { if (isFriendly) {
const friendlyTargets = this.resolveFriendlyTargets(targetEids, FacSet.HERO); const friendlyTargets = this.resolveFriendlyTargets(targetEids, FacSet.HERO);
console.log("[SCastSystem] friendlyTargets count =", friendlyTargets.length); mLogger.log(this.debugMode, "SCastSystem", "friendlyTargets count =", friendlyTargets.length);
if (friendlyTargets.length === 0) continue; if (friendlyTargets.length === 0) continue;
this.applyFriendlySkillEffects(s_uuid, cardLv, config, null as any, mockAttrs, friendlyTargets, spawnPos); this.applyFriendlySkillEffects(s_uuid, cardLv, config, null as any, mockAttrs, friendlyTargets, spawnPos);
} else { } else {
@@ -460,7 +461,7 @@ export class SCastSystem extends ecs.ComblockSystem implements ecs.ISystemUpdate
if (!target.ent) return; if (!target.ent) return;
const model = target.ent.get(HeroAttrsComp); const model = target.ent.get(HeroAttrsComp);
if (!model || model.is_dead) return; if (!model || model.is_dead) return;
console.log(`[SCastSystem] applyActualFriendlyEffect: skill=${config.uuid} kind=${kind} buff_type=${config.buff_type} timed_buff_id=${config.timed_buff_id} buff_value=${config.buff_value} target=${model.hero_name}`); mLogger.log(this.debugMode, "SCastSystem", `applyActualFriendlyEffect: skill=${config.uuid} kind=${kind} buff_type=${config.buff_type} timed_buff_id=${config.timed_buff_id} buff_value=${config.buff_value} target=${model.hero_name}`);
if (config.endAnm && config.endAnm !== "") { if (config.endAnm && config.endAnm !== "") {
target.playEnd(config.endAnm); target.playEnd(config.endAnm);

44
assets/script/game/map/MissSkillsComp.ts
View File

@@ -28,7 +28,9 @@ import { SBox } from "./SBox";
import { oops } from "db://oops-framework/core/Oops"; import { oops } from "db://oops-framework/core/Oops";
import { GameEvent } from "../common/config/GameEvent"; import { GameEvent } from "../common/config/GameEvent";
import { BoxSet } from "../common/config/GameSet"; import { BoxSet } from "../common/config/GameSet";
import { SkillOverrides } from "../common/config/SkillSet"; import { SkillOverrides, SkillSet } from "../common/config/SkillSet";
import { smc } from "../common/SingletonModuleComp";
import { buffManager } from "../hero/BuffManager";
const { ccclass, property } = _decorator; const { ccclass, property } = _decorator;
/** 技能槽位数据结构 */ /** 技能槽位数据结构 */
@@ -74,7 +76,7 @@ export class MissSkillsComp extends CCComp {
/** 注册事件监听 */ /** 注册事件监听 */
onLoad() { onLoad() {
oops.message.on(GameEvent.UseSkillCard, this.onUseSkillCard, this); oops.message.on(GameEvent.UseSkillCard, this.onUseSkillCard, this);
oops.message.on(GameEvent.UseItemCard, this.onUseSkillCard, this); oops.message.on(GameEvent.UseItemCard, this.onUseItemCard, this);
oops.message.on(GameEvent.RemoveSkillBox, this.onRemoveSkillBox, this); oops.message.on(GameEvent.RemoveSkillBox, this.onRemoveSkillBox, this);
} }
@@ -82,7 +84,7 @@ export class MissSkillsComp extends CCComp {
onDestroy() { onDestroy() {
super.onDestroy(); super.onDestroy();
oops.message.off(GameEvent.UseSkillCard, this.onUseSkillCard, this); oops.message.off(GameEvent.UseSkillCard, this.onUseSkillCard, this);
oops.message.off(GameEvent.UseItemCard, this.onUseSkillCard, this); oops.message.off(GameEvent.UseItemCard, this.onUseItemCard, this);
oops.message.off(GameEvent.RemoveSkillBox, this.onRemoveSkillBox, this); oops.message.off(GameEvent.RemoveSkillBox, this.onRemoveSkillBox, this);
} }
@@ -149,6 +151,42 @@ export class MissSkillsComp extends CCComp {
this.addSkill(skillUuid, card_lv, payload?.overrides); this.addSkill(skillUuid, card_lv, payload?.overrides);
} }
/**
* 处理药水卡使用事件：直接对全队存活英雄施加计时 buff，不经过 SBox 施法流程。
*
* 设计：
* 药水是"即时全队强化"，无需节点、动画、槽位；
* 从技能配置取 timed_buff_id，遍历 heroGrid 对每个存活英雄 applyBuff，
* buff_value 覆写值透传到 ActiveBuff.value_override。
*
* @param event 事件名
* @param args 卡牌数据（含 skill、overrides）
*/
private onUseItemCard(event: string, args: any) {
const payload = args ?? event;
const skillId = Number(payload?.skill ?? 0);
const config = SkillSet[skillId];
if (!config) {
mLogger.warn(this.debugMode, "MissSkillsComp", `potion skill ${skillId} config not found`);
return;
}
const buffId = config.timed_buff_id;
if (buffId === undefined) {
mLogger.warn(this.debugMode, "MissSkillsComp", `potion skill ${skillId} has no timed_buff_id`);
return;
}
const buffValue = payload?.overrides?.buff_value;
let applied = 0;
for (const eid of smc.mission.heroGrid) {
if (eid <= 0) continue;
const entity = ecs.getEntityByEid(eid);
if (!entity) continue;
buffManager.applyBuff(entity, buffId, 0, 0, buffValue !== undefined ? { value: buffValue } : undefined);
applied++;
}
mLogger.log(this.debugMode, "MissSkillsComp", `potion applied: skill=${skillId} buff=${buffId} value=${buffValue} heroes=${applied}`);
}
start() { start() {
} }