feat(map): 优化战斗流程与卡牌系统交互

1.  第一波准备阶段首个英雄召唤后自动开战,移除手动点击开始按钮
2.  重构卡牌交互逻辑,移除上划召唤改为点击召唤
3.  新增英雄卡池显隐切换功能
4.  调整卡牌预制体尺寸与布局
5.  移除特定波次技能卡弹窗逻辑
6.  简化引导流程,不再弹出Guide4
This commit is contained in:
panFD
2026-07-20 22:20:18 +08:00
parent 15ab2f7b0f
commit 76085c3ecd
5 changed files with 18934 additions and 13689 deletions

View File

@@ -58,14 +58,14 @@
"_active": true,
"_components": [
{
"__id__": 323
"__id__": 327
},
{
"__id__": 325
"__id__": 329
}
],
"_prefab": {
"__id__": 327
"__id__": 331
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -515,8 +515,8 @@
],
"value": {
"__type__": "cc.Size",
"width": 200,
"height": 270
"width": 170,
"height": 230
}
},
{
@@ -766,8 +766,8 @@
],
"value": {
"__type__": "cc.Size",
"width": 200,
"height": 270
"width": 170,
"height": 230
}
},
{
@@ -786,8 +786,8 @@
],
"value": {
"__type__": "cc.Size",
"width": 400,
"height": 540
"width": 340,
"height": 460
}
},
{
@@ -806,8 +806,8 @@
],
"value": {
"__type__": "cc.Size",
"width": 392,
"height": 528
"width": 332,
"height": 448
}
},
{
@@ -826,7 +826,7 @@
],
"value": {
"__type__": "cc.Size",
"width": 170,
"width": 140,
"height": 140
}
},
@@ -846,7 +846,7 @@
],
"value": {
"__type__": "cc.Size",
"width": 340,
"width": 280,
"height": 280
}
},
@@ -867,7 +867,7 @@
"value": {
"__type__": "cc.Vec3",
"x": 0,
"y": 50,
"y": 30,
"z": 0
}
},
@@ -1926,8 +1926,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 200,
"height": 270
"width": 170,
"height": 230
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -2071,7 +2071,7 @@
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
"y": 50,
"y": 30,
"z": 0
},
"_lrot": {
@@ -2247,7 +2247,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 170,
"width": 140,
"height": 140
},
"_anchorPoint": {
@@ -2413,8 +2413,8 @@
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 79,
"y": 114,
"x": 64,
"y": 94,
"z": 0
},
"_lrot": {
@@ -3050,8 +3050,8 @@
},
"_lpos": {
"__type__": "cc.Vec3",
"x": -56.79599999999999,
"y": -114.26499999999999,
"x": -41.79599999999999,
"y": -94.265,
"z": 0
},
"_lrot": {
@@ -3708,8 +3708,8 @@
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 55.925,
"y": -114.26499999999999,
"x": 40.925,
"y": -94.265,
"z": 0
},
"_lrot": {
@@ -4516,7 +4516,7 @@
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
"y": -41.72399999999999,
"y": -61.72399999999999,
"z": 0
},
"_lrot": {
@@ -4723,8 +4723,8 @@
},
"_lpos": {
"__type__": "cc.Vec3",
"x": -79,
"y": 114,
"x": -64,
"y": 94,
"z": 0
},
"_lrot": {
@@ -5683,22 +5683,25 @@
"__id__": 308
},
{
"__id__": 314
"__id__": 316
}
],
"_active": false,
"_active": true,
"_components": [
{
"__id__": 320
"__id__": 322
},
{
"__id__": 324
}
],
"_prefab": {
"__id__": 322
"__id__": 326
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
"y": -23.213,
"y": -142.978,
"z": 0
},
"_lrot": {
@@ -5740,10 +5743,13 @@
},
{
"__id__": 311
},
{
"__id__": 313
}
],
"_prefab": {
"__id__": 313
"__id__": 315
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -5760,8 +5766,8 @@
},
"_lscale": {
"__type__": "cc.Vec3",
"x": 0.8,
"y": 0.8,
"x": 0.5,
"y": 0.5,
"z": 1
},
"_mobility": 0,
@@ -5788,8 +5794,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 185,
"height": 81
"width": 340,
"height": 100
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -5828,9 +5834,9 @@
"__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@b2501",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 0,
"_type": 1,
"_fillType": 0,
"_sizeMode": 1,
"_sizeMode": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
@@ -5847,6 +5853,42 @@
"__type__": "cc.CompPrefabInfo",
"fileId": "08MkVcRXlJh64uV97FC5zt"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 308
},
"_enabled": true,
"__prefab": {
"__id__": 314
},
"_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": 340,
"_originalHeight": 0,
"_alignMode": 2,
"_lockFlags": 0,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "e0NAQnwtdBJbK3eTqlXN1t"
},
{
"__type__": "cc.PrefabInfo",
"root": {
@@ -5872,14 +5914,14 @@
"_active": true,
"_components": [
{
"__id__": 315
"__id__": 317
},
{
"__id__": 317
"__id__": 319
}
],
"_prefab": {
"__id__": 319
"__id__": 321
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -5916,11 +5958,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 314
"__id__": 316
},
"_enabled": true,
"__prefab": {
"__id__": 316
"__id__": 318
},
"_contentSize": {
"__type__": "cc.Size",
@@ -5944,11 +5986,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 314
"__id__": 316
},
"_enabled": true,
"__prefab": {
"__id__": 318
"__id__": 320
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -6029,11 +6071,11 @@
},
"_enabled": true,
"__prefab": {
"__id__": 321
"__id__": 323
},
"_contentSize": {
"__type__": "cc.Size",
"width": 148,
"width": 170,
"height": 64.8
},
"_anchorPoint": {
@@ -6047,6 +6089,42 @@
"__type__": "cc.CompPrefabInfo",
"fileId": "94GKNoSM1MwIqd0zy183DD"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 307
},
"_enabled": true,
"__prefab": {
"__id__": 325
},
"_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": 170,
"_originalHeight": 0,
"_alignMode": 2,
"_lockFlags": 0,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "89gxeFO+ZD9q7ucM1+gj9B"
},
{
"__type__": "cc.PrefabInfo",
"root": {
@@ -6070,12 +6148,12 @@
},
"_enabled": true,
"__prefab": {
"__id__": 324
"__id__": 328
},
"_contentSize": {
"__type__": "cc.Size",
"width": 200,
"height": 270
"width": 170,
"height": 230
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -6098,7 +6176,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 326
"__id__": 330
},
"Lock": null,
"unLock": null,

File diff suppressed because it is too large Load Diff