From 7e86aed50034d3fc51e0fa41ede8d1519bd4d2a0 Mon Sep 17 00:00:00 2001 From: panFD Date: Wed, 3 Jun 2026 22:40:09 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=8A=80=E8=83=BD?= =?UTF-8?q?=E5=8D=A1=E7=B3=BB=E7=BB=9F=EF=BC=8C=E4=BC=98=E5=8C=96=E5=8D=A1?= =?UTF-8?q?=E7=89=8C=E6=93=8D=E4=BD=9C=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 调整任务开始按钮显示逻辑，新增nobg节点控制 2. 重构卡牌拖拽逻辑，技能卡改为点击使用，英雄卡保留上划使用 3. 修改技能卡牌初始消耗为0 4. 新增技能卡槽面板，在特定波次开放技能卡抽取 5. 新增技能卡刷新按钮与相关回调逻辑 6. 优化抽卡UI显示与费用更新逻辑 --- assets/resources/gui/element/mission.prefab | 3041 ++++++++++--------- assets/script/game/common/config/CardSet.ts | 16 +- assets/script/game/map/CardComp.ts | 36 +- assets/script/game/map/MissionCardComp.ts | 175 +- assets/script/game/map/MissionComp.ts | 16 +- 5 files changed, 1836 insertions(+), 1448 deletions(-) diff --git a/assets/resources/gui/element/mission.prefab b/assets/resources/gui/element/mission.prefab index acc94c19..8ef209e1 100644 --- a/assets/resources/gui/element/mission.prefab +++ b/assets/resources/gui/element/mission.prefab @@ -31,41 +31,41 @@ "__id__": 138 }, { - "__id__": 648 + "__id__": 656 }, { - "__id__": 659 + "__id__": 667 }, { - "__id__": 684 + "__id__": 692 }, { - "__id__": 714 + "__id__": 722 } ], "_active": true, "_components": [ { - "__id__": 763 + "__id__": 774 }, { - "__id__": 765 + "__id__": 776 }, { - "__id__": 767 + "__id__": 778 }, { - "__id__": 769 + "__id__": 780 }, { - "__id__": 771 + "__id__": 782 }, { - "__id__": 773 + "__id__": 784 } ], "_prefab": { - "__id__": 822 + "__id__": 833 }, "_lpos": { "__type__": "cc.Vec3", @@ -2689,45 +2689,45 @@ { "__id__": 283 }, - { - "__id__": 481 - }, { "__id__": 489 }, { - "__id__": 510 + "__id__": 497 }, { - "__id__": 531 + "__id__": 518 }, { - "__id__": 546 + "__id__": 539 }, { - "__id__": 561 + "__id__": 554 }, { "__id__": 569 + }, + { + "__id__": 577 } ], "_active": true, "_components": [ { - "__id__": 639 + "__id__": 647 }, { - "__id__": 641 + "__id__": 649 }, { - "__id__": 643 + "__id__": 651 }, { - "__id__": 645 + "__id__": 653 } ], "_prefab": { - "__id__": 647 + "__id__": 655 }, "_lpos": { "__type__": "cc.Vec3", @@ -6079,26 +6079,26 @@ "__id__": 304 }, { - "__id__": 354 + "__id__": 362 }, { - "__id__": 386 + "__id__": 394 } ], "_active": true, "_components": [ { - "__id__": 474 + "__id__": 482 }, { - "__id__": 476 + "__id__": 484 }, { - "__id__": 478 + "__id__": 486 } ], "_prefab": { - "__id__": 480 + "__id__": 488 }, "_lpos": { "__type__": "cc.Vec3", @@ -6595,17 +6595,20 @@ "__id__": 313 }, { - "__id__": 345 + "__id__": 321 + }, + { + "__id__": 353 } ], "_active": true, "_components": [ { - "__id__": 351 + "__id__": 359 } ], "_prefab": { - "__id__": 353 + "__id__": 361 }, "_lpos": { "__type__": "cc.Vec3", @@ -6735,12 +6738,12 @@ "_color": { "__type__": "cc.Color", "r": 255, - "g": 255, - "b": 255, + "g": 229, + "b": 39, "a": 255 }, "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@cd9c1", + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@abf7b", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -6754,7 +6757,7 @@ "_fillStart": 0, "_fillRange": 0, "_isTrimmedMode": true, - "_useGrayscale": false, + "_useGrayscale": true, "_atlas": { "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", "__expectedType__": "cc.SpriteAtlas" @@ -6814,6 +6817,184 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "nobg", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 304 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 314 + }, + { + "__id__": 316 + }, + { + "__id__": 318 + } + ], + "_prefab": { + "__id__": 320 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 55, + "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__": 313 + }, + "_enabled": true, + "__prefab": { + "__id__": 315 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 110, + "height": 110 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "724rMWCXpNDJgsAUTd9sG/" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 313 + }, + "_enabled": true, + "__prefab": { + "__id__": 317 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@abf7b", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": true, + "_atlas": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", + "__expectedType__": "cc.SpriteAtlas" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f0AZcLuO5ItaS5sLj5khxm" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 313 + }, + "_enabled": true, + "__prefab": { + "__id__": 319 + }, + "_alignFlags": 45, + "_target": null, + "_left": 15, + "_right": 15, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 180, + "_originalHeight": 120, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "46kpVW0HVErY+1ufnoGKAM" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "abKz1JhSVAP4lmGSiAhimy", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.Node", "_name": "coin", @@ -6824,26 +7005,26 @@ }, "_children": [ { - "__id__": 314 + "__id__": 322 }, { - "__id__": 320 + "__id__": 328 }, { - "__id__": 326 + "__id__": 334 } ], "_active": true, "_components": [ { - "__id__": 340 + "__id__": 348 }, { - "__id__": 342 + "__id__": 350 } ], "_prefab": { - "__id__": 344 + "__id__": 352 }, "_lpos": { "__type__": "cc.Vec3", @@ -6880,20 +7061,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 313 + "__id__": 321 }, "_children": [], "_active": false, "_components": [ { - "__id__": 315 + "__id__": 323 }, { - "__id__": 317 + "__id__": 325 } ], "_prefab": { - "__id__": 319 + "__id__": 327 }, "_lpos": { "__type__": "cc.Vec3", @@ -6930,11 +7111,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 314 + "__id__": 322 }, "_enabled": true, "__prefab": { - "__id__": 316 + "__id__": 324 }, "_contentSize": { "__type__": "cc.Size", @@ -6958,11 +7139,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 314 + "__id__": 322 }, "_enabled": true, "__prefab": { - "__id__": 318 + "__id__": 326 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7016,20 +7197,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 313 + "__id__": 321 }, "_children": [], "_active": true, "_components": [ { - "__id__": 321 + "__id__": 329 }, { - "__id__": 323 + "__id__": 331 } ], "_prefab": { - "__id__": 325 + "__id__": 333 }, "_lpos": { "__type__": "cc.Vec3", @@ -7066,11 +7247,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 320 + "__id__": 328 }, "_enabled": true, "__prefab": { - "__id__": 322 + "__id__": 330 }, "_contentSize": { "__type__": "cc.Size", @@ -7094,11 +7275,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 320 + "__id__": 328 }, "_enabled": true, "__prefab": { - "__id__": 324 + "__id__": 332 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7155,24 +7336,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 313 + "__id__": 321 }, "_children": [ { - "__id__": 327 + "__id__": 335 } ], "_active": true, "_components": [ { - "__id__": 335 + "__id__": 343 }, { - "__id__": 337 + "__id__": 345 } ], "_prefab": { - "__id__": 339 + "__id__": 347 }, "_lpos": { "__type__": "cc.Vec3", @@ -7209,23 +7390,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 326 + "__id__": 334 }, "_children": [], "_active": false, "_components": [ { - "__id__": 328 + "__id__": 336 }, { - "__id__": 330 + "__id__": 338 }, { - "__id__": 332 + "__id__": 340 } ], "_prefab": { - "__id__": 334 + "__id__": 342 }, "_lpos": { "__type__": "cc.Vec3", @@ -7262,11 +7443,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 327 + "__id__": 335 }, "_enabled": true, "__prefab": { - "__id__": 329 + "__id__": 337 }, "_contentSize": { "__type__": "cc.Size", @@ -7290,11 +7471,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 327 + "__id__": 335 }, "_enabled": true, "__prefab": { - "__id__": 331 + "__id__": 339 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7358,11 +7539,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 327 + "__id__": 335 }, "_enabled": true, "__prefab": { - "__id__": 333 + "__id__": 341 }, "_alignFlags": 8, "_target": null, @@ -7407,11 +7588,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 326 + "__id__": 334 }, "_enabled": true, "__prefab": { - "__id__": 336 + "__id__": 344 }, "_contentSize": { "__type__": "cc.Size", @@ -7435,11 +7616,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 326 + "__id__": 334 }, "_enabled": true, "__prefab": { - "__id__": 338 + "__id__": 346 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7516,11 +7697,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 313 + "__id__": 321 }, "_enabled": true, "__prefab": { - "__id__": 341 + "__id__": 349 }, "_contentSize": { "__type__": "cc.Size", @@ -7544,11 +7725,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 313 + "__id__": 321 }, "_enabled": true, "__prefab": { - "__id__": 343 + "__id__": 351 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7605,14 +7786,14 @@ "_active": true, "_components": [ { - "__id__": 346 + "__id__": 354 }, { - "__id__": 348 + "__id__": 356 } ], "_prefab": { - "__id__": 350 + "__id__": 358 }, "_lpos": { "__type__": "cc.Vec3", @@ -7649,11 +7830,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 345 + "__id__": 353 }, "_enabled": true, "__prefab": { - "__id__": 347 + "__id__": 355 }, "_contentSize": { "__type__": "cc.Size", @@ -7677,11 +7858,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 345 + "__id__": 353 }, "_enabled": true, "__prefab": { - "__id__": 349 + "__id__": 357 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7762,7 +7943,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 352 + "__id__": 360 }, "_contentSize": { "__type__": "cc.Size", @@ -7802,30 +7983,30 @@ "__id__": 283 }, "_children": [ - { - "__id__": 355 - }, { "__id__": 363 }, { "__id__": 371 + }, + { + "__id__": 379 } ], "_active": true, "_components": [ { - "__id__": 379 + "__id__": 387 }, { - "__id__": 381 + "__id__": 389 }, { - "__id__": 383 + "__id__": 391 } ], "_prefab": { - "__id__": 385 + "__id__": 393 }, "_lpos": { "__type__": "cc.Vec3", @@ -7862,186 +8043,8 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 354 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 356 - }, - { - "__id__": 358 - }, - { - "__id__": 360 - } - ], - "_prefab": { "__id__": 362 }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": -54.95, - "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__": 355 - }, - "_enabled": true, - "__prefab": { - "__id__": 357 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 110, - "height": 109.9 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "bdndmAI41NkZ9VMutp8NRq" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 355 - }, - "_enabled": true, - "__prefab": { - "__id__": 359 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@abf7b", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 1, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", - "__expectedType__": "cc.SpriteAtlas" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "1f0kGrDO1I9qo/3x/Hrhe1" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 355 - }, - "_enabled": true, - "__prefab": { - "__id__": 361 - }, - "_alignFlags": 45, - "_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": 216, - "_originalHeight": 106, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "020Gypo/9NKrNzaSZ1jebp" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "6fmabCuyBAY6h/wkoN0izK", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "nobg", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 354 - }, "_children": [], "_active": true, "_components": [ @@ -8113,7 +8116,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "1c8KUp3nVP/I3MAyJyYMGd" + "fileId": "bdndmAI41NkZ9VMutp8NRq" }, { "__type__": "cc.Sprite", @@ -8132,9 +8135,187 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 163, - "g": 163, - "b": 163, + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@abf7b", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", + "__expectedType__": "cc.SpriteAtlas" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "1f0kGrDO1I9qo/3x/Hrhe1" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 363 + }, + "_enabled": true, + "__prefab": { + "__id__": 369 + }, + "_alignFlags": 45, + "_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": 216, + "_originalHeight": 106, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "020Gypo/9NKrNzaSZ1jebp" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "6fmabCuyBAY6h/wkoN0izK", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "nobg", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 362 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 372 + }, + { + "__id__": 374 + }, + { + "__id__": 376 + } + ], + "_prefab": { + "__id__": 378 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -54.95, + "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__": 371 + }, + "_enabled": true, + "__prefab": { + "__id__": 373 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 110, + "height": 109.9 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "1c8KUp3nVP/I3MAyJyYMGd" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 371 + }, + "_enabled": true, + "__prefab": { + "__id__": 375 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, "a": 255 }, "_spriteFrame": { @@ -8169,11 +8350,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 363 + "__id__": 371 }, "_enabled": true, "__prefab": { - "__id__": 369 + "__id__": 377 }, "_alignFlags": 45, "_target": null, @@ -8218,23 +8399,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 354 + "__id__": 362 }, "_children": [], "_active": true, "_components": [ { - "__id__": 372 + "__id__": 380 }, { - "__id__": 374 + "__id__": 382 }, { - "__id__": 376 + "__id__": 384 } ], "_prefab": { - "__id__": 378 + "__id__": 386 }, "_lpos": { "__type__": "cc.Vec3", @@ -8271,11 +8452,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 371 + "__id__": 379 }, "_enabled": true, "__prefab": { - "__id__": 373 + "__id__": 381 }, "_contentSize": { "__type__": "cc.Size", @@ -8299,11 +8480,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 371 + "__id__": 379 }, "_enabled": true, "__prefab": { - "__id__": 375 + "__id__": 383 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8367,11 +8548,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 371 + "__id__": 379 }, "_enabled": true, "__prefab": { - "__id__": 377 + "__id__": 385 }, "_alignFlags": 16, "_target": null, @@ -8416,11 +8597,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 354 + "__id__": 362 }, "_enabled": true, "__prefab": { - "__id__": 380 + "__id__": 388 }, "_contentSize": { "__type__": "cc.Size", @@ -8444,11 +8625,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 354 + "__id__": 362 }, "_enabled": true, "__prefab": { - "__id__": 382 + "__id__": 390 }, "_alignFlags": 20, "_target": null, @@ -8480,11 +8661,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 354 + "__id__": 362 }, "_enabled": true, "__prefab": { - "__id__": 384 + "__id__": 392 }, "clickEvents": [], "_interactable": true, @@ -8553,32 +8734,32 @@ }, "_children": [ { - "__id__": 387 + "__id__": 395 }, { - "__id__": 413 + "__id__": 421 }, { - "__id__": 435 + "__id__": 443 } ], "_active": true, "_components": [ { - "__id__": 465 + "__id__": 473 }, { - "__id__": 467 + "__id__": 475 }, { - "__id__": 469 + "__id__": 477 }, { - "__id__": 471 + "__id__": 479 } ], "_prefab": { - "__id__": 473 + "__id__": 481 }, "_lpos": { "__type__": "cc.Vec3", @@ -8615,33 +8796,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 386 + "__id__": 394 }, "_children": [ { - "__id__": 388 + "__id__": 396 }, { - "__id__": 394 + "__id__": 402 }, { - "__id__": 400 + "__id__": 408 } ], "_active": true, "_components": [ { - "__id__": 406 + "__id__": 414 }, { - "__id__": 408 + "__id__": 416 }, { - "__id__": 410 + "__id__": 418 } ], "_prefab": { - "__id__": 412 + "__id__": 420 }, "_lpos": { "__type__": "cc.Vec3", @@ -8678,20 +8859,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 387 + "__id__": 395 }, "_children": [], "_active": true, "_components": [ { - "__id__": 389 + "__id__": 397 }, { - "__id__": 391 + "__id__": 399 } ], "_prefab": { - "__id__": 393 + "__id__": 401 }, "_lpos": { "__type__": "cc.Vec3", @@ -8728,11 +8909,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 388 + "__id__": 396 }, "_enabled": true, "__prefab": { - "__id__": 390 + "__id__": 398 }, "_contentSize": { "__type__": "cc.Size", @@ -8756,11 +8937,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 388 + "__id__": 396 }, "_enabled": true, "__prefab": { - "__id__": 392 + "__id__": 400 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8814,20 +8995,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 387 + "__id__": 395 }, "_children": [], "_active": false, "_components": [ { - "__id__": 395 + "__id__": 403 }, { - "__id__": 397 + "__id__": 405 } ], "_prefab": { - "__id__": 399 + "__id__": 407 }, "_lpos": { "__type__": "cc.Vec3", @@ -8864,11 +9045,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 394 + "__id__": 402 }, "_enabled": true, "__prefab": { - "__id__": 396 + "__id__": 404 }, "_contentSize": { "__type__": "cc.Size", @@ -8892,11 +9073,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 394 + "__id__": 402 }, "_enabled": true, "__prefab": { - "__id__": 398 + "__id__": 406 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8973,20 +9154,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 387 + "__id__": 395 }, "_children": [], "_active": true, "_components": [ { - "__id__": 401 + "__id__": 409 }, { - "__id__": 403 + "__id__": 411 } ], "_prefab": { - "__id__": 405 + "__id__": 413 }, "_lpos": { "__type__": "cc.Vec3", @@ -9023,11 +9204,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 400 + "__id__": 408 }, "_enabled": true, "__prefab": { - "__id__": 402 + "__id__": 410 }, "_contentSize": { "__type__": "cc.Size", @@ -9051,11 +9232,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 400 + "__id__": 408 }, "_enabled": true, "__prefab": { - "__id__": 404 + "__id__": 412 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9132,11 +9313,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 387 + "__id__": 395 }, "_enabled": true, "__prefab": { - "__id__": 407 + "__id__": 415 }, "_contentSize": { "__type__": "cc.Size", @@ -9160,11 +9341,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 387 + "__id__": 395 }, "_enabled": false, "__prefab": { - "__id__": 409 + "__id__": 417 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9205,11 +9386,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 387 + "__id__": 395 }, "_enabled": false, "__prefab": { - "__id__": 411 + "__id__": 419 }, "_alignFlags": 44, "_target": null, @@ -9254,30 +9435,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 386 + "__id__": 394 }, "_children": [ { - "__id__": 414 + "__id__": 422 }, { - "__id__": 420 + "__id__": 428 } ], "_active": true, "_components": [ { - "__id__": 428 + "__id__": 436 }, { - "__id__": 430 + "__id__": 438 }, { - "__id__": 432 + "__id__": 440 } ], "_prefab": { - "__id__": 434 + "__id__": 442 }, "_lpos": { "__type__": "cc.Vec3", @@ -9314,20 +9495,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 413 + "__id__": 421 }, "_children": [], "_active": true, "_components": [ { - "__id__": 415 + "__id__": 423 }, { - "__id__": 417 + "__id__": 425 } ], "_prefab": { - "__id__": 419 + "__id__": 427 }, "_lpos": { "__type__": "cc.Vec3", @@ -9364,11 +9545,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 414 + "__id__": 422 }, "_enabled": true, "__prefab": { - "__id__": 416 + "__id__": 424 }, "_contentSize": { "__type__": "cc.Size", @@ -9392,11 +9573,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 414 + "__id__": 422 }, "_enabled": true, "__prefab": { - "__id__": 418 + "__id__": 426 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9453,23 +9634,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 413 + "__id__": 421 }, "_children": [], "_active": true, "_components": [ { - "__id__": 421 + "__id__": 429 }, { - "__id__": 423 + "__id__": 431 }, { - "__id__": 425 + "__id__": 433 } ], "_prefab": { - "__id__": 427 + "__id__": 435 }, "_lpos": { "__type__": "cc.Vec3", @@ -9506,11 +9687,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 420 + "__id__": 428 }, "_enabled": true, "__prefab": { - "__id__": 422 + "__id__": 430 }, "_contentSize": { "__type__": "cc.Size", @@ -9534,11 +9715,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 420 + "__id__": 428 }, "_enabled": true, "__prefab": { - "__id__": 424 + "__id__": 432 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9602,11 +9783,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 420 + "__id__": 428 }, "_enabled": true, "__prefab": { - "__id__": 426 + "__id__": 434 }, "templateMode": true, "watchPath": "0", @@ -9639,11 +9820,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 413 + "__id__": 421 }, "_enabled": true, "__prefab": { - "__id__": 429 + "__id__": 437 }, "_contentSize": { "__type__": "cc.Size", @@ -9667,11 +9848,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 413 + "__id__": 421 }, "_enabled": true, "__prefab": { - "__id__": 431 + "__id__": 439 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9709,11 +9890,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 413 + "__id__": 421 }, "_enabled": false, "__prefab": { - "__id__": 433 + "__id__": 441 }, "_alignFlags": 40, "_target": null, @@ -9758,33 +9939,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 386 + "__id__": 394 }, "_children": [ - { - "__id__": 436 - }, { "__id__": 444 }, { - "__id__": 450 + "__id__": 452 + }, + { + "__id__": 458 } ], "_active": true, "_components": [ { - "__id__": 458 + "__id__": 466 }, { - "__id__": 460 + "__id__": 468 }, { - "__id__": 462 + "__id__": 470 } ], "_prefab": { - "__id__": 464 + "__id__": 472 }, "_lpos": { "__type__": "cc.Vec3", @@ -9821,23 +10002,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 435 + "__id__": 443 }, "_children": [], "_active": false, "_components": [ { - "__id__": 437 + "__id__": 445 }, { - "__id__": 439 + "__id__": 447 }, { - "__id__": 441 + "__id__": 449 } ], "_prefab": { - "__id__": 443 + "__id__": 451 }, "_lpos": { "__type__": "cc.Vec3", @@ -9874,11 +10055,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 436 + "__id__": 444 }, "_enabled": true, "__prefab": { - "__id__": 438 + "__id__": 446 }, "_contentSize": { "__type__": "cc.Size", @@ -9902,11 +10083,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 436 + "__id__": 444 }, "_enabled": true, "__prefab": { - "__id__": 440 + "__id__": 448 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9950,11 +10131,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 436 + "__id__": 444 }, "_enabled": true, "__prefab": { - "__id__": 442 + "__id__": 450 }, "_alignFlags": 45, "_target": null, @@ -9999,20 +10180,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 435 + "__id__": 443 }, "_children": [], "_active": true, "_components": [ { - "__id__": 445 + "__id__": 453 }, { - "__id__": 447 + "__id__": 455 } ], "_prefab": { - "__id__": 449 + "__id__": 457 }, "_lpos": { "__type__": "cc.Vec3", @@ -10049,11 +10230,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 444 + "__id__": 452 }, "_enabled": true, "__prefab": { - "__id__": 446 + "__id__": 454 }, "_contentSize": { "__type__": "cc.Size", @@ -10077,11 +10258,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 444 + "__id__": 452 }, "_enabled": true, "__prefab": { - "__id__": 448 + "__id__": 456 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10138,23 +10319,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 435 + "__id__": 443 }, "_children": [], "_active": true, "_components": [ { - "__id__": 451 + "__id__": 459 }, { - "__id__": 453 + "__id__": 461 }, { - "__id__": 455 + "__id__": 463 } ], "_prefab": { - "__id__": 457 + "__id__": 465 }, "_lpos": { "__type__": "cc.Vec3", @@ -10191,11 +10372,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 450 + "__id__": 458 }, "_enabled": true, "__prefab": { - "__id__": 452 + "__id__": 460 }, "_contentSize": { "__type__": "cc.Size", @@ -10219,11 +10400,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 450 + "__id__": 458 }, "_enabled": true, "__prefab": { - "__id__": 454 + "__id__": 462 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10287,11 +10468,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 450 + "__id__": 458 }, "_enabled": true, "__prefab": { - "__id__": 456 + "__id__": 464 }, "templateMode": true, "watchPath": "", @@ -10325,11 +10506,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 435 + "__id__": 443 }, "_enabled": true, "__prefab": { - "__id__": 459 + "__id__": 467 }, "_contentSize": { "__type__": "cc.Size", @@ -10353,11 +10534,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 435 + "__id__": 443 }, "_enabled": true, "__prefab": { - "__id__": 461 + "__id__": 469 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10395,11 +10576,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 435 + "__id__": 443 }, "_enabled": false, "__prefab": { - "__id__": 463 + "__id__": 471 }, "_alignFlags": 40, "_target": null, @@ -10444,11 +10625,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 386 + "__id__": 394 }, "_enabled": true, "__prefab": { - "__id__": 466 + "__id__": 474 }, "_contentSize": { "__type__": "cc.Size", @@ -10472,11 +10653,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 386 + "__id__": 394 }, "_enabled": true, "__prefab": { - "__id__": 468 + "__id__": 476 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10520,11 +10701,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 386 + "__id__": 394 }, "_enabled": true, "__prefab": { - "__id__": 470 + "__id__": 478 }, "_alignFlags": 40, "_target": null, @@ -10556,11 +10737,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 386 + "__id__": 394 }, "_enabled": true, "__prefab": { - "__id__": 472 + "__id__": 480 }, "_resizeMode": 0, "_layoutType": 1, @@ -10611,7 +10792,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 475 + "__id__": 483 }, "_contentSize": { "__type__": "cc.Size", @@ -10639,7 +10820,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 477 + "__id__": 485 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10681,7 +10862,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 479 + "__id__": 487 }, "_alignFlags": 32, "_target": null, @@ -10732,17 +10913,17 @@ "_active": false, "_components": [ { - "__id__": 482 + "__id__": 490 }, { - "__id__": 484 + "__id__": 492 }, { - "__id__": 486 + "__id__": 494 } ], "_prefab": { - "__id__": 488 + "__id__": 496 }, "_lpos": { "__type__": "cc.Vec3", @@ -10779,11 +10960,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 481 + "__id__": 489 }, "_enabled": true, "__prefab": { - "__id__": 483 + "__id__": 491 }, "_contentSize": { "__type__": "cc.Size", @@ -10807,11 +10988,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 481 + "__id__": 489 }, "_enabled": true, "__prefab": { - "__id__": 485 + "__id__": 493 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10855,11 +11036,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 481 + "__id__": 489 }, "_enabled": true, "__prefab": { - "__id__": 487 + "__id__": 495 }, "_alignFlags": 45, "_target": null, @@ -10905,14 +11086,14 @@ "__id__": 138 }, "_prefab": { - "__id__": 490 + "__id__": 498 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 489 + "__id__": 497 }, "asset": { "__uuid__": "8aaff904-8c27-4173-9716-7161893b336e", @@ -10920,7 +11101,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 491 + "__id__": 499 }, "targetOverrides": null }, @@ -10933,18 +11114,6 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 492 - }, - { - "__id__": 494 - }, - { - "__id__": 496 - }, - { - "__id__": 498 - }, { "__id__": 500 }, @@ -10959,6 +11128,18 @@ }, { "__id__": 508 + }, + { + "__id__": 510 + }, + { + "__id__": 512 + }, + { + "__id__": 514 + }, + { + "__id__": 516 } ], "removedComponents": [] @@ -10966,7 +11147,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 493 + "__id__": 501 }, "propertyPath": [ "_name" @@ -10982,7 +11163,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 495 + "__id__": 503 }, "propertyPath": [ "_lpos" @@ -11003,7 +11184,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 497 + "__id__": 505 }, "propertyPath": [ "_lrot" @@ -11025,7 +11206,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 499 + "__id__": 507 }, "propertyPath": [ "_euler" @@ -11046,7 +11227,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 501 + "__id__": 509 }, "propertyPath": [ "_active" @@ -11062,7 +11243,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 503 + "__id__": 511 }, "propertyPath": [ "_contentSize" @@ -11082,7 +11263,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 505 + "__id__": 513 }, "propertyPath": [ "_contentSize" @@ -11102,7 +11283,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 507 + "__id__": 515 }, "propertyPath": [ "_lpos" @@ -11123,7 +11304,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 509 + "__id__": 517 }, "propertyPath": [ "_lpos" @@ -11148,14 +11329,14 @@ "__id__": 138 }, "_prefab": { - "__id__": 511 + "__id__": 519 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 510 + "__id__": 518 }, "asset": { "__uuid__": "8aaff904-8c27-4173-9716-7161893b336e", @@ -11163,7 +11344,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 512 + "__id__": 520 }, "targetOverrides": null }, @@ -11176,18 +11357,6 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 513 - }, - { - "__id__": 515 - }, - { - "__id__": 517 - }, - { - "__id__": 519 - }, { "__id__": 521 }, @@ -11202,6 +11371,18 @@ }, { "__id__": 529 + }, + { + "__id__": 531 + }, + { + "__id__": 533 + }, + { + "__id__": 535 + }, + { + "__id__": 537 } ], "removedComponents": [] @@ -11209,7 +11390,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 514 + "__id__": 522 }, "propertyPath": [ "_name" @@ -11225,7 +11406,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 516 + "__id__": 524 }, "propertyPath": [ "_lpos" @@ -11246,7 +11427,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 518 + "__id__": 526 }, "propertyPath": [ "_lrot" @@ -11268,7 +11449,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 520 + "__id__": 528 }, "propertyPath": [ "_euler" @@ -11289,7 +11470,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 522 + "__id__": 530 }, "propertyPath": [ "_active" @@ -11305,7 +11486,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 524 + "__id__": 532 }, "propertyPath": [ "_contentSize" @@ -11325,7 +11506,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 526 + "__id__": 534 }, "propertyPath": [ "_contentSize" @@ -11345,7 +11526,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 528 + "__id__": 536 }, "propertyPath": [ "_lpos" @@ -11366,7 +11547,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 530 + "__id__": 538 }, "propertyPath": [ "_lpos" @@ -11391,14 +11572,14 @@ "__id__": 138 }, "_prefab": { - "__id__": 532 + "__id__": 540 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 531 + "__id__": 539 }, "asset": { "__uuid__": "8aaff904-8c27-4173-9716-7161893b336e", @@ -11406,7 +11587,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 533 + "__id__": 541 }, "targetOverrides": null }, @@ -11419,23 +11600,23 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 534 - }, - { - "__id__": 536 - }, - { - "__id__": 538 - }, - { - "__id__": 540 - }, { "__id__": 542 }, { "__id__": 544 + }, + { + "__id__": 546 + }, + { + "__id__": 548 + }, + { + "__id__": 550 + }, + { + "__id__": 552 } ], "removedComponents": [] @@ -11443,7 +11624,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 535 + "__id__": 543 }, "propertyPath": [ "_name" @@ -11459,7 +11640,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 537 + "__id__": 545 }, "propertyPath": [ "_lpos" @@ -11480,7 +11661,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 539 + "__id__": 547 }, "propertyPath": [ "_lrot" @@ -11502,7 +11683,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 541 + "__id__": 549 }, "propertyPath": [ "_euler" @@ -11523,7 +11704,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 543 + "__id__": 551 }, "propertyPath": [ "_active" @@ -11539,7 +11720,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 545 + "__id__": 553 }, "propertyPath": [ "_contentSize" @@ -11563,14 +11744,14 @@ "__id__": 138 }, "_prefab": { - "__id__": 547 + "__id__": 555 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 546 + "__id__": 554 }, "asset": { "__uuid__": "8aaff904-8c27-4173-9716-7161893b336e", @@ -11578,7 +11759,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 548 + "__id__": 556 }, "targetOverrides": null }, @@ -11591,23 +11772,23 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 549 - }, - { - "__id__": 551 - }, - { - "__id__": 553 - }, - { - "__id__": 555 - }, { "__id__": 557 }, { "__id__": 559 + }, + { + "__id__": 561 + }, + { + "__id__": 563 + }, + { + "__id__": 565 + }, + { + "__id__": 567 } ], "removedComponents": [] @@ -11615,7 +11796,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 550 + "__id__": 558 }, "propertyPath": [ "_name" @@ -11631,7 +11812,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 552 + "__id__": 560 }, "propertyPath": [ "_lpos" @@ -11652,7 +11833,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 554 + "__id__": 562 }, "propertyPath": [ "_lrot" @@ -11674,7 +11855,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 556 + "__id__": 564 }, "propertyPath": [ "_euler" @@ -11695,7 +11876,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 558 + "__id__": 566 }, "propertyPath": [ "_active" @@ -11711,7 +11892,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 560 + "__id__": 568 }, "propertyPath": [ "_contentSize" @@ -11740,17 +11921,17 @@ "_active": true, "_components": [ { - "__id__": 562 + "__id__": 570 }, { - "__id__": 564 + "__id__": 572 }, { - "__id__": 566 + "__id__": 574 } ], "_prefab": { - "__id__": 568 + "__id__": 576 }, "_lpos": { "__type__": "cc.Vec3", @@ -11787,11 +11968,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 561 + "__id__": 569 }, "_enabled": true, "__prefab": { - "__id__": 563 + "__id__": 571 }, "_contentSize": { "__type__": "cc.Size", @@ -11815,11 +11996,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 561 + "__id__": 569 }, "_enabled": true, "__prefab": { - "__id__": 565 + "__id__": 573 }, "_resizeMode": 1, "_layoutType": 1, @@ -11853,11 +12034,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 561 + "__id__": 569 }, "_enabled": true, "__prefab": { - "__id__": 567 + "__id__": 575 }, "_alignFlags": 44, "_target": null, @@ -11905,9 +12086,6 @@ "__id__": 138 }, "_children": [ - { - "__id__": 570 - }, { "__id__": 578 }, @@ -11915,23 +12093,26 @@ "__id__": 586 }, { - "__id__": 620 + "__id__": 594 }, { "__id__": 628 - } - ], - "_active": false, - "_components": [ - { - "__id__": 634 }, { "__id__": 636 } ], + "_active": false, + "_components": [ + { + "__id__": 642 + }, + { + "__id__": 644 + } + ], "_prefab": { - "__id__": 638 + "__id__": 646 }, "_lpos": { "__type__": "cc.Vec3", @@ -11968,186 +12149,8 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 569 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 571 - }, - { - "__id__": 573 - }, - { - "__id__": 575 - } - ], - "_prefab": { "__id__": 577 }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 55, - "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__": 570 - }, - "_enabled": true, - "__prefab": { - "__id__": 572 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 220, - "height": 110 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "6akkasJtRKsKGIQ6iE2fLR" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 570 - }, - "_enabled": true, - "__prefab": { - "__id__": 574 - }, - "_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@e9165", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 1, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": { - "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4", - "__expectedType__": "cc.SpriteAtlas" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "acPy7f7sJBg4R5Dd6deMoS" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 570 - }, - "_enabled": true, - "__prefab": { - "__id__": 576 - }, - "_alignFlags": 45, - "_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": 180, - "_originalHeight": 120, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "07jVqQ6fhP6odyTB1XLUyx" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "fb++6W6z5Lo6uWOXJ516hh", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "nobg", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 569 - }, "_children": [], "_active": true, "_components": [ @@ -12219,7 +12222,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "6eL31eymxLlJ9K3llqLmad" + "fileId": "6akkasJtRKsKGIQ6iE2fLR" }, { "__type__": "cc.Sprite", @@ -12258,6 +12261,184 @@ "_fillStart": 0, "_fillRange": 0, "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": { + "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4", + "__expectedType__": "cc.SpriteAtlas" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "acPy7f7sJBg4R5Dd6deMoS" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 578 + }, + "_enabled": true, + "__prefab": { + "__id__": 584 + }, + "_alignFlags": 45, + "_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": 180, + "_originalHeight": 120, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "07jVqQ6fhP6odyTB1XLUyx" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "fb++6W6z5Lo6uWOXJ516hh", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "nobg", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 577 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 587 + }, + { + "__id__": 589 + }, + { + "__id__": 591 + } + ], + "_prefab": { + "__id__": 593 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 55, + "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__": 586 + }, + "_enabled": true, + "__prefab": { + "__id__": 588 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 220, + "height": 110 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "6eL31eymxLlJ9K3llqLmad" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 586 + }, + "_enabled": true, + "__prefab": { + "__id__": 590 + }, + "_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@e9165", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, "_useGrayscale": true, "_atlas": { "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4", @@ -12275,11 +12456,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 578 + "__id__": 586 }, "_enabled": true, "__prefab": { - "__id__": 584 + "__id__": 592 }, "_alignFlags": 45, "_target": null, @@ -12324,33 +12505,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 569 + "__id__": 577 }, "_children": [ { - "__id__": 587 + "__id__": 595 }, { - "__id__": 593 + "__id__": 601 }, { - "__id__": 599 + "__id__": 607 } ], "_active": true, "_components": [ { - "__id__": 613 + "__id__": 621 }, { - "__id__": 615 + "__id__": 623 }, { - "__id__": 617 + "__id__": 625 } ], "_prefab": { - "__id__": 619 + "__id__": 627 }, "_lpos": { "__type__": "cc.Vec3", @@ -12387,20 +12568,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 586 + "__id__": 594 }, "_children": [], "_active": true, "_components": [ { - "__id__": 588 + "__id__": 596 }, { - "__id__": 590 + "__id__": 598 } ], "_prefab": { - "__id__": 592 + "__id__": 600 }, "_lpos": { "__type__": "cc.Vec3", @@ -12437,11 +12618,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 587 + "__id__": 595 }, "_enabled": true, "__prefab": { - "__id__": 589 + "__id__": 597 }, "_contentSize": { "__type__": "cc.Size", @@ -12465,11 +12646,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 587 + "__id__": 595 }, "_enabled": true, "__prefab": { - "__id__": 591 + "__id__": 599 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12523,20 +12704,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 586 + "__id__": 594 }, "_children": [], "_active": true, "_components": [ { - "__id__": 594 + "__id__": 602 }, { - "__id__": 596 + "__id__": 604 } ], "_prefab": { - "__id__": 598 + "__id__": 606 }, "_lpos": { "__type__": "cc.Vec3", @@ -12573,11 +12754,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 593 + "__id__": 601 }, "_enabled": true, "__prefab": { - "__id__": 595 + "__id__": 603 }, "_contentSize": { "__type__": "cc.Size", @@ -12601,11 +12782,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 593 + "__id__": 601 }, "_enabled": true, "__prefab": { - "__id__": 597 + "__id__": 605 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12662,24 +12843,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 586 + "__id__": 594 }, "_children": [ { - "__id__": 600 + "__id__": 608 } ], "_active": true, "_components": [ { - "__id__": 608 + "__id__": 616 }, { - "__id__": 610 + "__id__": 618 } ], "_prefab": { - "__id__": 612 + "__id__": 620 }, "_lpos": { "__type__": "cc.Vec3", @@ -12716,23 +12897,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 599 + "__id__": 607 }, "_children": [], "_active": true, "_components": [ { - "__id__": 601 + "__id__": 609 }, { - "__id__": 603 + "__id__": 611 }, { - "__id__": 605 + "__id__": 613 } ], "_prefab": { - "__id__": 607 + "__id__": 615 }, "_lpos": { "__type__": "cc.Vec3", @@ -12769,11 +12950,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 600 + "__id__": 608 }, "_enabled": true, "__prefab": { - "__id__": 602 + "__id__": 610 }, "_contentSize": { "__type__": "cc.Size", @@ -12797,11 +12978,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 600 + "__id__": 608 }, "_enabled": true, "__prefab": { - "__id__": 604 + "__id__": 612 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12865,11 +13046,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 600 + "__id__": 608 }, "_enabled": true, "__prefab": { - "__id__": 606 + "__id__": 614 }, "_alignFlags": 8, "_target": null, @@ -12914,11 +13095,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 599 + "__id__": 607 }, "_enabled": true, "__prefab": { - "__id__": 609 + "__id__": 617 }, "_contentSize": { "__type__": "cc.Size", @@ -12942,11 +13123,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 599 + "__id__": 607 }, "_enabled": true, "__prefab": { - "__id__": 611 + "__id__": 619 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13023,11 +13204,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 586 + "__id__": 594 }, "_enabled": true, "__prefab": { - "__id__": 614 + "__id__": 622 }, "_contentSize": { "__type__": "cc.Size", @@ -13051,11 +13232,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 586 + "__id__": 594 }, "_enabled": true, "__prefab": { - "__id__": 616 + "__id__": 624 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13093,11 +13274,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 586 + "__id__": 594 }, "_enabled": true, "__prefab": { - "__id__": 618 + "__id__": 626 }, "_alignFlags": 16, "_target": null, @@ -13142,23 +13323,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 569 + "__id__": 577 }, "_children": [], "_active": true, "_components": [ { - "__id__": 621 + "__id__": 629 }, { - "__id__": 623 + "__id__": 631 }, { - "__id__": 625 + "__id__": 633 } ], "_prefab": { - "__id__": 627 + "__id__": 635 }, "_lpos": { "__type__": "cc.Vec3", @@ -13195,11 +13376,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 620 + "__id__": 628 }, "_enabled": true, "__prefab": { - "__id__": 622 + "__id__": 630 }, "_contentSize": { "__type__": "cc.Size", @@ -13223,11 +13404,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 620 + "__id__": 628 }, "_enabled": true, "__prefab": { - "__id__": 624 + "__id__": 632 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13291,11 +13472,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 620 + "__id__": 628 }, "_enabled": true, "__prefab": { - "__id__": 626 + "__id__": 634 }, "_alignFlags": 16, "_target": null, @@ -13340,20 +13521,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 569 + "__id__": 577 }, "_children": [], "_active": false, "_components": [ { - "__id__": 629 + "__id__": 637 }, { - "__id__": 631 + "__id__": 639 } ], "_prefab": { - "__id__": 633 + "__id__": 641 }, "_lpos": { "__type__": "cc.Vec3", @@ -13390,11 +13571,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 628 + "__id__": 636 }, "_enabled": true, "__prefab": { - "__id__": 630 + "__id__": 638 }, "_contentSize": { "__type__": "cc.Size", @@ -13418,11 +13599,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 628 + "__id__": 636 }, "_enabled": true, "__prefab": { - "__id__": 632 + "__id__": 640 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13476,11 +13657,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 569 + "__id__": 577 }, "_enabled": true, "__prefab": { - "__id__": 635 + "__id__": 643 }, "_contentSize": { "__type__": "cc.Size", @@ -13504,11 +13685,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 569 + "__id__": 577 }, "_enabled": false, "__prefab": { - "__id__": 637 + "__id__": 645 }, "_alignFlags": 12, "_target": null, @@ -13557,7 +13738,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 640 + "__id__": 648 }, "_contentSize": { "__type__": "cc.Size", @@ -13585,7 +13766,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 642 + "__id__": 650 }, "_alignFlags": 44, "_target": null, @@ -13621,7 +13802,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 644 + "__id__": 652 }, "_resizeMode": 1, "_layoutType": 1, @@ -13659,7 +13840,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 646 + "__id__": 654 }, "_id": "" }, @@ -13687,14 +13868,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 649 + "__id__": 657 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 648 + "__id__": 656 }, "asset": { "__uuid__": "0f2aeee0-d590-4c36-9f20-a93b058d5b91", @@ -13702,7 +13883,7 @@ }, "fileId": "5622mxbS1PNqMFP0FH5Mir", "instance": { - "__id__": 650 + "__id__": 658 }, "targetOverrides": null }, @@ -13716,22 +13897,22 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 651 + "__id__": 659 }, { - "__id__": 653 + "__id__": 661 }, { - "__id__": 654 + "__id__": 662 }, { - "__id__": 655 + "__id__": 663 }, { - "__id__": 656 + "__id__": 664 }, { - "__id__": 658 + "__id__": 666 } ], "removedComponents": [] @@ -13739,7 +13920,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 652 + "__id__": 660 }, "propertyPath": [ "_name" @@ -13755,7 +13936,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 652 + "__id__": 660 }, "propertyPath": [ "_lpos" @@ -13770,7 +13951,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 652 + "__id__": 660 }, "propertyPath": [ "_lrot" @@ -13786,7 +13967,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 652 + "__id__": 660 }, "propertyPath": [ "_euler" @@ -13801,7 +13982,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 657 + "__id__": 665 }, "propertyPath": [ "_left" @@ -13817,7 +13998,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 657 + "__id__": 665 }, "propertyPath": [ "_verticalCenter" @@ -13834,26 +14015,26 @@ }, "_children": [ { - "__id__": 660 + "__id__": 668 }, { - "__id__": 668 + "__id__": 676 } ], "_active": true, "_components": [ { - "__id__": 676 + "__id__": 684 }, { - "__id__": 678 + "__id__": 686 }, { - "__id__": 681 + "__id__": 689 } ], "_prefab": { - "__id__": 683 + "__id__": 691 }, "_lpos": { "__type__": "cc.Vec3", @@ -13890,23 +14071,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 659 + "__id__": 667 }, "_children": [], "_active": true, "_components": [ { - "__id__": 661 + "__id__": 669 }, { - "__id__": 663 + "__id__": 671 }, { - "__id__": 665 + "__id__": 673 } ], "_prefab": { - "__id__": 667 + "__id__": 675 }, "_lpos": { "__type__": "cc.Vec3", @@ -13943,11 +14124,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 660 + "__id__": 668 }, "_enabled": true, "__prefab": { - "__id__": 662 + "__id__": 670 }, "_contentSize": { "__type__": "cc.Size", @@ -13971,11 +14152,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 660 + "__id__": 668 }, "_enabled": true, "__prefab": { - "__id__": 664 + "__id__": 672 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14019,11 +14200,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 660 + "__id__": 668 }, "_enabled": false, "__prefab": { - "__id__": 666 + "__id__": 674 }, "_alignFlags": 45, "_target": null, @@ -14068,23 +14249,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 659 + "__id__": 667 }, "_children": [], "_active": false, "_components": [ { - "__id__": 669 + "__id__": 677 }, { - "__id__": 671 + "__id__": 679 }, { - "__id__": 673 + "__id__": 681 } ], "_prefab": { - "__id__": 675 + "__id__": 683 }, "_lpos": { "__type__": "cc.Vec3", @@ -14121,11 +14302,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 668 + "__id__": 676 }, "_enabled": true, "__prefab": { - "__id__": 670 + "__id__": 678 }, "_contentSize": { "__type__": "cc.Size", @@ -14149,11 +14330,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 668 + "__id__": 676 }, "_enabled": true, "__prefab": { - "__id__": 672 + "__id__": 680 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14217,11 +14398,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 668 + "__id__": 676 }, "_enabled": true, "__prefab": { - "__id__": 674 + "__id__": 682 }, "_alignFlags": 16, "_target": null, @@ -14266,11 +14447,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 659 + "__id__": 667 }, "_enabled": true, "__prefab": { - "__id__": 677 + "__id__": 685 }, "_contentSize": { "__type__": "cc.Size", @@ -14294,15 +14475,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 659 + "__id__": 667 }, "_enabled": true, "__prefab": { - "__id__": 679 + "__id__": 687 }, "clickEvents": [ { - "__id__": 680 + "__id__": 688 } ], "_interactable": true, @@ -14342,7 +14523,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 659 + "__id__": 667 }, "_id": "" }, @@ -14366,11 +14547,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 659 + "__id__": 667 }, "_enabled": true, "__prefab": { - "__id__": 682 + "__id__": 690 }, "_alignFlags": 36, "_target": null, @@ -14419,26 +14600,26 @@ }, "_children": [ { - "__id__": 685 - }, - { - "__id__": 691 + "__id__": 693 }, { "__id__": 699 + }, + { + "__id__": 707 } ], "_active": true, "_components": [ { - "__id__": 709 + "__id__": 717 }, { - "__id__": 711 + "__id__": 719 } ], "_prefab": { - "__id__": 713 + "__id__": 721 }, "_lpos": { "__type__": "cc.Vec3", @@ -14475,20 +14656,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 684 + "__id__": 692 }, "_children": [], "_active": true, "_components": [ { - "__id__": 686 + "__id__": 694 }, { - "__id__": 688 + "__id__": 696 } ], "_prefab": { - "__id__": 690 + "__id__": 698 }, "_lpos": { "__type__": "cc.Vec3", @@ -14525,11 +14706,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 685 + "__id__": 693 }, "_enabled": true, "__prefab": { - "__id__": 687 + "__id__": 695 }, "_contentSize": { "__type__": "cc.Size", @@ -14553,11 +14734,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 685 + "__id__": 693 }, "_enabled": true, "__prefab": { - "__id__": 689 + "__id__": 697 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14611,23 +14792,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 684 + "__id__": 692 }, "_children": [], "_active": false, "_components": [ { - "__id__": 692 + "__id__": 700 }, { - "__id__": 694 + "__id__": 702 }, { - "__id__": 696 + "__id__": 704 } ], "_prefab": { - "__id__": 698 + "__id__": 706 }, "_lpos": { "__type__": "cc.Vec3", @@ -14664,11 +14845,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 691 + "__id__": 699 }, "_enabled": true, "__prefab": { - "__id__": 693 + "__id__": 701 }, "_contentSize": { "__type__": "cc.Size", @@ -14692,11 +14873,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 691 + "__id__": 699 }, "_enabled": true, "__prefab": { - "__id__": 695 + "__id__": 703 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14740,11 +14921,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 691 + "__id__": 699 }, "_enabled": true, "__prefab": { - "__id__": 697 + "__id__": 705 }, "_alignFlags": 40, "_target": null, @@ -14789,26 +14970,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 684 + "__id__": 692 }, "_children": [], "_active": true, "_components": [ { - "__id__": 700 + "__id__": 708 }, { - "__id__": 702 + "__id__": 710 }, { - "__id__": 704 + "__id__": 712 }, { - "__id__": 706 + "__id__": 714 } ], "_prefab": { - "__id__": 708 + "__id__": 716 }, "_lpos": { "__type__": "cc.Vec3", @@ -14845,11 +15026,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 699 + "__id__": 707 }, "_enabled": true, "__prefab": { - "__id__": 701 + "__id__": 709 }, "_contentSize": { "__type__": "cc.Size", @@ -14873,11 +15054,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 699 + "__id__": 707 }, "_enabled": true, "__prefab": { - "__id__": 703 + "__id__": 711 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14941,11 +15122,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 699 + "__id__": 707 }, "_enabled": true, "__prefab": { - "__id__": 705 + "__id__": 713 }, "_params": [], "_dataID": "", @@ -14961,11 +15142,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 699 + "__id__": 707 }, "_enabled": true, "__prefab": { - "__id__": 707 + "__id__": 715 }, "_alignFlags": 45, "_target": null, @@ -15010,11 +15191,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 684 + "__id__": 692 }, "_enabled": true, "__prefab": { - "__id__": 710 + "__id__": 718 }, "_contentSize": { "__type__": "cc.Size", @@ -15038,11 +15219,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 684 + "__id__": 692 }, "_enabled": true, "__prefab": { - "__id__": 712 + "__id__": 720 }, "_alignFlags": 1, "_target": null, @@ -15088,14 +15269,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 715 + "__id__": 723 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 714 + "__id__": 722 }, "asset": { "__uuid__": "053b0528-ec69-4ff8-85d7-99f128440121", @@ -15103,7 +15284,7 @@ }, "fileId": "d0FqR3MNdHHKbJYj7BXmc4", "instance": { - "__id__": 716 + "__id__": 724 }, "targetOverrides": null }, @@ -15117,29 +15298,17 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 717 + "__id__": 725 }, { - "__id__": 719 - }, - { - "__id__": 720 - }, - { - "__id__": 721 - }, - { - "__id__": 722 - }, - { - "__id__": 724 - }, - { - "__id__": 726 + "__id__": 727 }, { "__id__": 728 }, + { + "__id__": 729 + }, { "__id__": 730 }, @@ -15187,18 +15356,36 @@ }, { "__id__": 760 + }, + { + "__id__": 762 + }, + { + "__id__": 764 + }, + { + "__id__": 766 + }, + { + "__id__": 768 + }, + { + "__id__": 770 + }, + { + "__id__": 771 } ], "removedComponents": [ { - "__id__": 762 + "__id__": 773 } ] }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 718 + "__id__": 726 }, "propertyPath": [ "_name" @@ -15214,7 +15401,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 718 + "__id__": 726 }, "propertyPath": [ "_lpos" @@ -15229,7 +15416,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 718 + "__id__": 726 }, "propertyPath": [ "_lrot" @@ -15245,7 +15432,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 718 + "__id__": 726 }, "propertyPath": [ "_euler" @@ -15260,7 +15447,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 723 + "__id__": 731 }, "propertyPath": [ "_contentSize" @@ -15279,94 +15466,6 @@ "13j2oupQRMUoUyChWYn2yc" ] }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 725 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 210, - "height": 270 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "72UNg2+UNBeJvrTfdm+/Yx", - "fbT2L4/5lBv6CDydZR8SkP", - "c8mzU+nw5GLJ4CZ7ZTe6eE" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 727 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 420, - "height": 540 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "72UNg2+UNBeJvrTfdm+/Yx", - "fbT2L4/5lBv6CDydZR8SkP", - "5eZRKQByFG0LW2QA/PUw2u" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 729 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 412, - "height": 528 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "72UNg2+UNBeJvrTfdm+/Yx", - "fbT2L4/5lBv6CDydZR8SkP", - "4buoN7nzRM9Kty43yoN7ul" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 731 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 180, - "height": 140 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "72UNg2+UNBeJvrTfdm+/Yx", - "fbT2L4/5lBv6CDydZR8SkP", - "faGw1NMRpJ+IWtI609CAxN" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -15375,6 +15474,94 @@ "propertyPath": [ "_contentSize" ], + "value": { + "__type__": "cc.Size", + "width": 210, + "height": 270 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "72UNg2+UNBeJvrTfdm+/Yx", + "fbT2L4/5lBv6CDydZR8SkP", + "c8mzU+nw5GLJ4CZ7ZTe6eE" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 735 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 420, + "height": 540 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "72UNg2+UNBeJvrTfdm+/Yx", + "fbT2L4/5lBv6CDydZR8SkP", + "5eZRKQByFG0LW2QA/PUw2u" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 737 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 412, + "height": 528 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "72UNg2+UNBeJvrTfdm+/Yx", + "fbT2L4/5lBv6CDydZR8SkP", + "4buoN7nzRM9Kty43yoN7ul" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 739 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 180, + "height": 140 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "72UNg2+UNBeJvrTfdm+/Yx", + "fbT2L4/5lBv6CDydZR8SkP", + "faGw1NMRpJ+IWtI609CAxN" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 741 + }, + "propertyPath": [ + "_contentSize" + ], "value": { "__type__": "cc.Size", "width": 360, @@ -15392,7 +15579,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 735 + "__id__": 743 }, "propertyPath": [ "_contentSize" @@ -15414,7 +15601,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 737 + "__id__": 745 }, "propertyPath": [ "_contentSize" @@ -15436,7 +15623,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 739 + "__id__": 747 }, "propertyPath": [ "_contentSize" @@ -15458,7 +15645,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 741 + "__id__": 749 }, "propertyPath": [ "_contentSize" @@ -15480,7 +15667,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 743 + "__id__": 751 }, "propertyPath": [ "_contentSize" @@ -15502,7 +15689,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 745 + "__id__": 753 }, "propertyPath": [ "_contentSize" @@ -15524,7 +15711,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 747 + "__id__": 755 }, "propertyPath": [ "_lpos" @@ -15546,7 +15733,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 749 + "__id__": 757 }, "propertyPath": [ "_lpos" @@ -15568,7 +15755,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 751 + "__id__": 759 }, "propertyPath": [ "_contentSize" @@ -15590,7 +15777,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 753 + "__id__": 761 }, "propertyPath": [ "_contentSize" @@ -15612,7 +15799,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 755 + "__id__": 763 }, "propertyPath": [ "_contentSize" @@ -15634,7 +15821,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 757 + "__id__": 765 }, "propertyPath": [ "_contentSize" @@ -15656,7 +15843,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 759 + "__id__": 767 }, "propertyPath": [ "_contentSize" @@ -15678,7 +15865,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 761 + "__id__": 769 }, "propertyPath": [ "_contentSize" @@ -15697,6 +15884,38 @@ "5cf2X5S4JMQ7x3zijgLWIX" ] }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 726 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 772 + }, + "propertyPath": [ + "_color" + ], + "value": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 200 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "53M7FgPI5MCLRxtx62a5KJ" + ] + }, { "__type__": "cc.TargetInfo", "localID": [ @@ -15713,7 +15932,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 764 + "__id__": 775 }, "_contentSize": { "__type__": "cc.Size", @@ -15741,7 +15960,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 766 + "__id__": 777 }, "_alignFlags": 21, "_target": null, @@ -15777,7 +15996,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 768 + "__id__": 779 }, "debugMode": false, "showMemoryPanel": true, @@ -15786,13 +16005,13 @@ 10 ], "start_btn": { - "__id__": 354 + "__id__": 362 }, "time_node": { "__id__": 2 }, "tooltip": { - "__id__": 684 + "__id__": 692 }, "_id": "" }, @@ -15810,7 +16029,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 770 + "__id__": 781 }, "_id": "" }, @@ -15828,7 +16047,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 772 + "__id__": 783 }, "debugMode": false, "_id": "" @@ -15847,58 +16066,58 @@ }, "_enabled": true, "__prefab": { - "__id__": 774 + "__id__": 785 }, "cards_node": { "__id__": 138 }, "card1": { - "__id__": 489 + "__id__": 497 }, "card2": { - "__id__": 510 + "__id__": 518 }, "card3": { - "__id__": 531 + "__id__": 539 }, "card4": { - "__id__": 546 + "__id__": 554 }, "cards_chou": { "__id__": 304 }, "cards_up": { - "__id__": 569 + "__id__": 577 }, "coins_node": { - "__id__": 413 + "__id__": 421 }, "pool_lv_node": { - "__id__": 387 + "__id__": 395 }, "hero_num_node": { - "__id__": 435 + "__id__": 443 }, "skill_card_node": { - "__id__": 714 + "__id__": 722 }, "skill_card1": { - "__id__": 775 + "__id__": 786 }, "skill_card2": { - "__id__": 776 + "__id__": 787 }, "skill_card3": { - "__id__": 777 + "__id__": 788 }, "skill_refresh": { - "__id__": 778 + "__id__": 789 }, "skill_ad_refresh": { - "__id__": 780 + "__id__": 791 }, "skill_refresh_num_node": { - "__id__": 808 + "__id__": 819 }, "_id": "" }, @@ -15924,30 +16143,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 779 + "__id__": 790 }, "_children": [ { - "__id__": 802 + "__id__": 813 }, { - "__id__": 808 + "__id__": 819 } ], "_active": true, "_components": [ { - "__id__": 814 + "__id__": 825 }, { - "__id__": 816 + "__id__": 827 }, { - "__id__": 818 + "__id__": 829 } ], "_prefab": { - "__id__": 821 + "__id__": 832 }, "_lpos": { "__type__": "cc.Vec3", @@ -15984,30 +16203,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 714 + "__id__": 722 }, "_children": [ { - "__id__": 778 + "__id__": 789 }, { - "__id__": 780 + "__id__": 791 } ], "_active": true, "_components": [ { - "__id__": 795 + "__id__": 806 }, { - "__id__": 797 + "__id__": 808 }, { - "__id__": 799 + "__id__": 810 } ], "_prefab": { - "__id__": 801 + "__id__": 812 }, "_lpos": { "__type__": "cc.Vec3", @@ -16044,27 +16263,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 779 + "__id__": 790 }, "_children": [ { - "__id__": 781 + "__id__": 792 } ], "_active": true, "_components": [ { - "__id__": 787 + "__id__": 798 }, { - "__id__": 789 + "__id__": 800 }, { - "__id__": 791 + "__id__": 802 } ], "_prefab": { - "__id__": 794 + "__id__": 805 }, "_lpos": { "__type__": "cc.Vec3", @@ -16101,20 +16320,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 780 + "__id__": 791 }, "_children": [], "_active": true, "_components": [ { - "__id__": 782 + "__id__": 793 }, { - "__id__": 784 + "__id__": 795 } ], "_prefab": { - "__id__": 786 + "__id__": 797 }, "_lpos": { "__type__": "cc.Vec3", @@ -16151,11 +16370,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 781 + "__id__": 792 }, "_enabled": true, "__prefab": { - "__id__": 783 + "__id__": 794 }, "_contentSize": { "__type__": "cc.Size", @@ -16179,11 +16398,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 781 + "__id__": 792 }, "_enabled": true, "__prefab": { - "__id__": 785 + "__id__": 796 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16260,11 +16479,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 780 + "__id__": 791 }, "_enabled": true, "__prefab": { - "__id__": 788 + "__id__": 799 }, "_contentSize": { "__type__": "cc.Size", @@ -16288,11 +16507,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 780 + "__id__": 791 }, "_enabled": true, "__prefab": { - "__id__": 790 + "__id__": 801 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16336,15 +16555,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 780 + "__id__": 791 }, "_enabled": true, "__prefab": { - "__id__": 792 + "__id__": 803 }, "clickEvents": [ { - "__id__": 793 + "__id__": 804 } ], "_interactable": true, @@ -16393,7 +16612,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 714 + "__id__": 722 }, "component": "", "_componentId": "463c7iN7clDbLBuuJ6fqWQv", @@ -16419,11 +16638,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 779 + "__id__": 790 }, "_enabled": true, "__prefab": { - "__id__": 796 + "__id__": 807 }, "_contentSize": { "__type__": "cc.Size", @@ -16447,11 +16666,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 779 + "__id__": 790 }, "_enabled": true, "__prefab": { - "__id__": 798 + "__id__": 809 }, "_resizeMode": 1, "_layoutType": 1, @@ -16485,11 +16704,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 779 + "__id__": 790 }, "_enabled": true, "__prefab": { - "__id__": 800 + "__id__": 811 }, "_alignFlags": 4, "_target": null, @@ -16534,20 +16753,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 778 + "__id__": 789 }, "_children": [], "_active": true, "_components": [ { - "__id__": 803 + "__id__": 814 }, { - "__id__": 805 + "__id__": 816 } ], "_prefab": { - "__id__": 807 + "__id__": 818 }, "_lpos": { "__type__": "cc.Vec3", @@ -16584,11 +16803,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 802 + "__id__": 813 }, "_enabled": true, "__prefab": { - "__id__": 804 + "__id__": 815 }, "_contentSize": { "__type__": "cc.Size", @@ -16612,11 +16831,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 802 + "__id__": 813 }, "_enabled": true, "__prefab": { - "__id__": 806 + "__id__": 817 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16693,20 +16912,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 778 + "__id__": 789 }, "_children": [], "_active": true, "_components": [ { - "__id__": 809 + "__id__": 820 }, { - "__id__": 811 + "__id__": 822 } ], "_prefab": { - "__id__": 813 + "__id__": 824 }, "_lpos": { "__type__": "cc.Vec3", @@ -16743,11 +16962,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 808 + "__id__": 819 }, "_enabled": true, "__prefab": { - "__id__": 810 + "__id__": 821 }, "_contentSize": { "__type__": "cc.Size", @@ -16771,11 +16990,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 808 + "__id__": 819 }, "_enabled": true, "__prefab": { - "__id__": 812 + "__id__": 823 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16852,11 +17071,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 778 + "__id__": 789 }, "_enabled": true, "__prefab": { - "__id__": 815 + "__id__": 826 }, "_contentSize": { "__type__": "cc.Size", @@ -16880,11 +17099,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 778 + "__id__": 789 }, "_enabled": true, "__prefab": { - "__id__": 817 + "__id__": 828 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16928,15 +17147,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 778 + "__id__": 789 }, "_enabled": true, "__prefab": { - "__id__": 819 + "__id__": 830 }, "clickEvents": [ { - "__id__": 820 + "__id__": 831 } ], "_interactable": true, @@ -16985,7 +17204,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 714 + "__id__": 722 }, "component": "", "_componentId": "463c7iN7clDbLBuuJ6fqWQv", @@ -17017,78 +17236,78 @@ "instance": null, "targetOverrides": [ { - "__id__": 823 + "__id__": 834 }, { - "__id__": 826 + "__id__": 837 }, { - "__id__": 829 + "__id__": 840 }, { - "__id__": 832 + "__id__": 843 }, { - "__id__": 835 + "__id__": 846 }, { - "__id__": 838 + "__id__": 849 }, { - "__id__": 841 + "__id__": 852 }, { - "__id__": 844 + "__id__": 855 }, { - "__id__": 847 - }, - { - "__id__": 850 - }, - { - "__id__": 853 - }, - { - "__id__": 856 - }, - { - "__id__": 859 + "__id__": 858 }, { "__id__": 861 }, { - "__id__": 863 - }, - { - "__id__": 865 + "__id__": 864 }, { "__id__": 867 }, { - "__id__": 869 + "__id__": 870 + }, + { + "__id__": 872 + }, + { + "__id__": 874 + }, + { + "__id__": 876 + }, + { + "__id__": 878 + }, + { + "__id__": 880 } ], "nestedPrefabInstanceRoots": [ { - "__id__": 714 + "__id__": 722 }, { - "__id__": 648 + "__id__": 656 }, { - "__id__": 546 + "__id__": 554 }, { - "__id__": 531 + "__id__": 539 }, { - "__id__": 510 + "__id__": 518 }, { - "__id__": 489 + "__id__": 497 }, { "__id__": 116 @@ -17116,7 +17335,7 @@ "__id__": 64 }, "sourceInfo": { - "__id__": 824 + "__id__": 835 }, "propertyPath": [ "icon_node" @@ -17125,127 +17344,7 @@ "__id__": 64 }, "targetInfo": { - "__id__": 825 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "11S1XoDG5Ndo+S7MbRH4us" - ] - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "b5xpz003VN+JjcOmrDrKg0" - ] - }, - { - "__type__": "cc.TargetOverrideInfo", - "source": { - "__id__": 64 - }, - "sourceInfo": { - "__id__": 827 - }, - "propertyPath": [ - "sell_node" - ], - "target": { - "__id__": 64 - }, - "targetInfo": { - "__id__": 828 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "11S1XoDG5Ndo+S7MbRH4us" - ] - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "02JrX+YSZAXZFrDj1ZF6Vq" - ] - }, - { - "__type__": "cc.TargetOverrideInfo", - "source": { - "__id__": 75 - }, - "sourceInfo": { - "__id__": 830 - }, - "propertyPath": [ - "icon_node" - ], - "target": { - "__id__": 75 - }, - "targetInfo": { - "__id__": 831 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "11S1XoDG5Ndo+S7MbRH4us" - ] - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "b5xpz003VN+JjcOmrDrKg0" - ] - }, - { - "__type__": "cc.TargetOverrideInfo", - "source": { - "__id__": 75 - }, - "sourceInfo": { - "__id__": 833 - }, - "propertyPath": [ - "sell_node" - ], - "target": { - "__id__": 75 - }, - "targetInfo": { - "__id__": 834 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "11S1XoDG5Ndo+S7MbRH4us" - ] - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "02JrX+YSZAXZFrDj1ZF6Vq" - ] - }, - { - "__type__": "cc.TargetOverrideInfo", - "source": { - "__id__": 86 - }, - "sourceInfo": { "__id__": 836 - }, - "propertyPath": [ - "icon_node" - ], - "target": { - "__id__": 86 - }, - "targetInfo": { - "__id__": 837 } }, { @@ -17263,10 +17362,130 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 86 + "__id__": 64 }, "sourceInfo": { + "__id__": 838 + }, + "propertyPath": [ + "sell_node" + ], + "target": { + "__id__": 64 + }, + "targetInfo": { "__id__": 839 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "11S1XoDG5Ndo+S7MbRH4us" + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "02JrX+YSZAXZFrDj1ZF6Vq" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 75 + }, + "sourceInfo": { + "__id__": 841 + }, + "propertyPath": [ + "icon_node" + ], + "target": { + "__id__": 75 + }, + "targetInfo": { + "__id__": 842 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "11S1XoDG5Ndo+S7MbRH4us" + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "b5xpz003VN+JjcOmrDrKg0" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 75 + }, + "sourceInfo": { + "__id__": 844 + }, + "propertyPath": [ + "sell_node" + ], + "target": { + "__id__": 75 + }, + "targetInfo": { + "__id__": 845 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "11S1XoDG5Ndo+S7MbRH4us" + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "02JrX+YSZAXZFrDj1ZF6Vq" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 86 + }, + "sourceInfo": { + "__id__": 847 + }, + "propertyPath": [ + "icon_node" + ], + "target": { + "__id__": 86 + }, + "targetInfo": { + "__id__": 848 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "11S1XoDG5Ndo+S7MbRH4us" + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "b5xpz003VN+JjcOmrDrKg0" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 86 + }, + "sourceInfo": { + "__id__": 850 }, "propertyPath": [ "sell_node" @@ -17275,118 +17494,118 @@ "__id__": 86 }, "targetInfo": { - "__id__": 840 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "11S1XoDG5Ndo+S7MbRH4us" - ] - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "02JrX+YSZAXZFrDj1ZF6Vq" - ] - }, - { - "__type__": "cc.TargetOverrideInfo", - "source": { - "__id__": 96 - }, - "sourceInfo": { - "__id__": 842 - }, - "propertyPath": [ - "icon_node" - ], - "target": { - "__id__": 96 - }, - "targetInfo": { - "__id__": 843 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "11S1XoDG5Ndo+S7MbRH4us" - ] - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "b5xpz003VN+JjcOmrDrKg0" - ] - }, - { - "__type__": "cc.TargetOverrideInfo", - "source": { - "__id__": 96 - }, - "sourceInfo": { - "__id__": 845 - }, - "propertyPath": [ - "sell_node" - ], - "target": { - "__id__": 96 - }, - "targetInfo": { - "__id__": 846 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "11S1XoDG5Ndo+S7MbRH4us" - ] - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "02JrX+YSZAXZFrDj1ZF6Vq" - ] - }, - { - "__type__": "cc.TargetOverrideInfo", - "source": { - "__id__": 106 - }, - "sourceInfo": { - "__id__": 848 - }, - "propertyPath": [ - "icon_node" - ], - "target": { - "__id__": 106 - }, - "targetInfo": { - "__id__": 849 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "11S1XoDG5Ndo+S7MbRH4us" - ] - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "b5xpz003VN+JjcOmrDrKg0" - ] - }, - { - "__type__": "cc.TargetOverrideInfo", - "source": { - "__id__": 106 - }, - "sourceInfo": { "__id__": 851 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "11S1XoDG5Ndo+S7MbRH4us" + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "02JrX+YSZAXZFrDj1ZF6Vq" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 96 + }, + "sourceInfo": { + "__id__": 853 + }, + "propertyPath": [ + "icon_node" + ], + "target": { + "__id__": 96 + }, + "targetInfo": { + "__id__": 854 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "11S1XoDG5Ndo+S7MbRH4us" + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "b5xpz003VN+JjcOmrDrKg0" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 96 + }, + "sourceInfo": { + "__id__": 856 + }, + "propertyPath": [ + "sell_node" + ], + "target": { + "__id__": 96 + }, + "targetInfo": { + "__id__": 857 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "11S1XoDG5Ndo+S7MbRH4us" + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "02JrX+YSZAXZFrDj1ZF6Vq" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 106 + }, + "sourceInfo": { + "__id__": 859 + }, + "propertyPath": [ + "icon_node" + ], + "target": { + "__id__": 106 + }, + "targetInfo": { + "__id__": 860 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "11S1XoDG5Ndo+S7MbRH4us" + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "b5xpz003VN+JjcOmrDrKg0" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 106 + }, + "sourceInfo": { + "__id__": 862 }, "propertyPath": [ "sell_node" @@ -17395,7 +17614,7 @@ "__id__": 106 }, "targetInfo": { - "__id__": 852 + "__id__": 863 } }, { @@ -17416,7 +17635,7 @@ "__id__": 116 }, "sourceInfo": { - "__id__": 854 + "__id__": 865 }, "propertyPath": [ "icon_node" @@ -17425,7 +17644,7 @@ "__id__": 116 }, "targetInfo": { - "__id__": 855 + "__id__": 866 } }, { @@ -17446,7 +17665,7 @@ "__id__": 116 }, "sourceInfo": { - "__id__": 857 + "__id__": 868 }, "propertyPath": [ "sell_node" @@ -17455,7 +17674,7 @@ "__id__": 116 }, "targetInfo": { - "__id__": 858 + "__id__": 869 } }, { @@ -17473,17 +17692,17 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 773 + "__id__": 784 }, "sourceInfo": null, "propertyPath": [ "skill_card1" ], "target": { - "__id__": 714 + "__id__": 722 }, "targetInfo": { - "__id__": 860 + "__id__": 871 } }, { @@ -17496,17 +17715,17 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 773 + "__id__": 784 }, "sourceInfo": null, "propertyPath": [ "skill_card2" ], "target": { - "__id__": 714 + "__id__": 722 }, "targetInfo": { - "__id__": 862 + "__id__": 873 } }, { @@ -17519,17 +17738,17 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 773 + "__id__": 784 }, "sourceInfo": null, "propertyPath": [ "skill_card3" ], "target": { - "__id__": 714 + "__id__": 722 }, "targetInfo": { - "__id__": 864 + "__id__": 875 } }, { @@ -17542,17 +17761,17 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 773 + "__id__": 784 }, "sourceInfo": null, "propertyPath": [ "skill_refresh" ], "target": { - "__id__": 714 + "__id__": 722 }, "targetInfo": { - "__id__": 866 + "__id__": 877 } }, { @@ -17564,17 +17783,17 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 773 + "__id__": 784 }, "sourceInfo": null, "propertyPath": [ "skill_ad_refresh" ], "target": { - "__id__": 714 + "__id__": 722 }, "targetInfo": { - "__id__": 868 + "__id__": 879 } }, { @@ -17586,17 +17805,17 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 773 + "__id__": 784 }, "sourceInfo": null, "propertyPath": [ "skill_refresh_num_node" ], "target": { - "__id__": 714 + "__id__": 722 }, "targetInfo": { - "__id__": 870 + "__id__": 881 } }, { diff --git a/assets/script/game/common/config/CardSet.ts b/assets/script/game/common/config/CardSet.ts index f81d7a82..599fbd0f 100644 --- a/assets/script/game/common/config/CardSet.ts +++ b/assets/script/game/common/config/CardSet.ts @@ -126,14 +126,14 @@ HeroList.forEach(uuid => { // 添加非英雄卡牌 (技能、功能卡) CardPoolList.push( // 技能卡牌 (以增益/辅助为主，因为在备战期没有敌人) - { uuid: 6401, type: CardType.Skill, cost: 8, weight: 20, pool_lv: 1, kind: CKind.Skill, card_lv: 1, name: t("skill_name_6401"), info: t("skill_info_6401"), is_inst: true, t_times: 1, t_inv: 0 }, - { uuid: 6402, type: CardType.Skill, cost: 8, weight: 20, pool_lv: 1, kind: CKind.Skill, card_lv: 1, name: t("skill_name_6402"), info: t("skill_info_6402"), is_inst: true, t_times: 1, t_inv: 0 }, - { uuid: 6403, type: CardType.Skill, cost: 8, weight: 20, pool_lv: 1, kind: CKind.Skill, card_lv: 1, name: t("skill_name_6403"), info: t("skill_info_6403"), is_inst: true, t_times: 1, t_inv: 0 }, - { uuid: 6404, type: CardType.Skill, cost: 8, weight: 20, pool_lv: 1, kind: CKind.Skill, card_lv: 1, name: t("skill_name_6404"), info: t("skill_info_6404"), is_inst: true, t_times: 1, t_inv: 0 }, - { uuid: 6405, type: CardType.Skill, cost: 8, weight: 20, pool_lv: 2, kind: CKind.Skill, card_lv: 1, name: t("skill_name_6405"), info: t("skill_info_6405"), is_inst: true, t_times: 1, t_inv: 0 }, - { uuid: 6406, type: CardType.Skill, cost: 8, weight: 20, pool_lv: 2, kind: CKind.Skill, card_lv: 1, name: t("skill_name_6406"), info: t("skill_info_6406"), is_inst: true, t_times: 1, t_inv: 0 }, - { uuid: 6304, type: CardType.Skill, cost: 8, weight: 20, pool_lv: 3, kind: CKind.Skill, card_lv: 1, name: t("skill_name_6304"), info: t("skill_info_6304"), is_inst: true, t_times: 1, t_inv: 0 }, - { uuid: 6305, type: CardType.Skill, cost: 8, weight: 20, pool_lv: 3, kind: CKind.Skill, card_lv: 1, name: t("skill_name_6305"), info: t("skill_info_6305"), is_inst: true, t_times: 1, t_inv: 0 }, + { uuid: 6401, type: CardType.Skill, cost: 0, weight: 20, pool_lv: 1, kind: CKind.Skill, card_lv: 1, name: t("skill_name_6401"), info: t("skill_info_6401"), is_inst: true, t_times: 1, t_inv: 0 }, + { uuid: 6402, type: CardType.Skill, cost: 0, weight: 20, pool_lv: 1, kind: CKind.Skill, card_lv: 1, name: t("skill_name_6402"), info: t("skill_info_6402"), is_inst: true, t_times: 1, t_inv: 0 }, + { uuid: 6403, type: CardType.Skill, cost: 0, weight: 20, pool_lv: 1, kind: CKind.Skill, card_lv: 1, name: t("skill_name_6403"), info: t("skill_info_6403"), is_inst: true, t_times: 1, t_inv: 0 }, + { uuid: 6404, type: CardType.Skill, cost: 0, weight: 20, pool_lv: 1, kind: CKind.Skill, card_lv: 1, name: t("skill_name_6404"), info: t("skill_info_6404"), is_inst: true, t_times: 1, t_inv: 0 }, + { uuid: 6405, type: CardType.Skill, cost: 0, weight: 20, pool_lv: 2, kind: CKind.Skill, card_lv: 1, name: t("skill_name_6405"), info: t("skill_info_6405"), is_inst: true, t_times: 1, t_inv: 0 }, + { uuid: 6406, type: CardType.Skill, cost: 0, weight: 20, pool_lv: 2, kind: CKind.Skill, card_lv: 1, name: t("skill_name_6406"), info: t("skill_info_6406"), is_inst: true, t_times: 1, t_inv: 0 }, + { uuid: 6304, type: CardType.Skill, cost: 0, weight: 20, pool_lv: 3, kind: CKind.Skill, card_lv: 1, name: t("skill_name_6304"), info: t("skill_info_6304"), is_inst: true, t_times: 1, t_inv: 0 }, + { uuid: 6305, type: CardType.Skill, cost: 0, weight: 20, pool_lv: 3, kind: CKind.Skill, card_lv: 1, name: t("skill_name_6305"), info: t("skill_info_6305"), is_inst: true, t_times: 1, t_inv: 0 }, ); diff --git a/assets/script/game/map/CardComp.ts b/assets/script/game/map/CardComp.ts index 148d9e44..aa70d516 100644 --- a/assets/script/game/map/CardComp.ts +++ b/assets/script/game/map/CardComp.ts @@ -110,6 +110,8 @@ export class CardComp extends CCComp { private readonly dragUseThreshold: number = 70; /** 触摸起始 Y 坐标，用于计算拖拽距离 */ private touchStartY: number = 0; + /** 触摸起始 X 坐标，用于点击判断 */ + private touchStartX: number = 0; /** 当前是否正在拖拽 */ private isDragging: boolean = false; /** 当前是否正在执行"使用"流程（防止重复触发） */ @@ -483,6 +485,7 @@ export class CardComp extends CCComp { private onCardTouchStart(event: EventTouch) { if (!this.cardData || this.isUsing) return; this.touchStartY = event.getUILocation().y; + this.touchStartX = event.getUILocation().x; this.isDragging = true; this.isLongPressed = false; this.unschedule(this.onLongPress); @@ -503,19 +506,26 @@ export class CardComp extends CCComp { oops.gui.remove(UIID.HInfo); } } - this.node.setPosition(this.restPosition.x, this.restPosition.y + deltaY, this.restPosition.z); + + // 技能卡不支持上划移动 + if (this.cardData.type !== CardType.Skill) { + this.node.setPosition(this.restPosition.x, this.restPosition.y + deltaY, this.restPosition.z); + } } /** * 触摸结束： - * - 上拉距离 >= dragUseThreshold → 视为"使用卡牌" + * - 技能卡：点击即可使用 + * - 英雄卡/其他：上拉距离 >= dragUseThreshold → 视为"使用卡牌" * - 否则视为"点击"或者"长按结束" */ private onCardTouchEnd(event: EventTouch) { this.unschedule(this.onLongPress); if (!this.isDragging || !this.cardData || this.isUsing) return; const endY = event.getUILocation().y; + const endX = event.getUILocation().x; const deltaY = endY - this.touchStartY; + const deltaX = endX - this.touchStartX; this.isDragging = false; if (this.isLongPressed) { @@ -523,12 +533,24 @@ export class CardComp extends CCComp { oops.gui.remove(UIID.HInfo); } - if (deltaY >= this.dragUseThreshold) { - const used = this.useCard(); - if (!used) { - this.playReboundAnim(); + // 技能卡改为点击使用 + if (this.cardData.type === CardType.Skill) { + if (Math.abs(deltaY) < 20 && Math.abs(deltaX) < 20) { + const used = this.useCard(); + if (!used) { + this.playReboundAnim(); + } + return; + } + } else { + // 英雄卡保持上划使用 + if (deltaY >= this.dragUseThreshold) { + const used = this.useCard(); + if (!used) { + this.playReboundAnim(); + } + return; } - return; } this.playReboundAnim(); diff --git a/assets/script/game/map/MissionCardComp.ts b/assets/script/game/map/MissionCardComp.ts index c05d14b2..6b6415a5 100644 --- a/assets/script/game/map/MissionCardComp.ts +++ b/assets/script/game/map/MissionCardComp.ts @@ -137,6 +137,8 @@ export class MissionCardComp extends CCComp { /** 四个槽位对应的 CardComp 控制器缓存（有序数组） */ private cardComps: CardComp[] = []; + /** 技能卡槽控制器缓存 */ + private skillCardComps: CardComp[] = []; /** 当前卡池等级（仅影响抽卡来源，不直接改卡槽现有内容） */ private poolLv: number = CARD_POOL_INIT_LEVEL; /** 是否已缓存卡牌面板基准缩放 */ @@ -228,6 +230,12 @@ export class MissionCardComp extends CCComp { } const cards = this.buildDrawCards(); this.dispatchCardsToSlots(cards); + + const wave = this.getCurrentWave(); + if ([1, 5, 10, 15, 20].includes(wave)) { + this.showSkillCardPopup(); + } + mLogger.log(this.debugMode, "MissionCardComp", "mission start", { poolLv: this.poolLv }); @@ -279,6 +287,7 @@ export class MissionCardComp extends CCComp { oops.message.on(GameEvent.HeroDead, this.onHeroDead, this); oops.message.on(GameEvent.HeroSell, this.onHeroSell, this); oops.message.on(GameEvent.UseHeroCard, this.onUseHeroCard, this); + oops.message.on(GameEvent.UseSkillCard, this.onUseSkillCard, this); oops.message.on(GameEvent.UseSpecialCard, this.onUseSpecialCard, this); oops.message.on(GameEvent.CardPoolUpgrade, this.onCardPoolUpgrade, this); @@ -286,6 +295,14 @@ export class MissionCardComp extends CCComp { this.cards_chou?.on(NodeEventType.TOUCH_START, this.onDrawTouchStart, this); this.cards_chou?.on(NodeEventType.TOUCH_END, this.onDrawTouchEnd, this); this.cards_chou?.on(NodeEventType.TOUCH_CANCEL, this.onDrawTouchCancel, this); + + /** 技能卡刷新按钮 */ + this.skill_refresh?.on(NodeEventType.TOUCH_START, this.onSkillDrawTouchStart, this); + this.skill_refresh?.on(NodeEventType.TOUCH_END, this.onSkillDrawTouchEnd, this); + this.skill_refresh?.on(NodeEventType.TOUCH_CANCEL, this.onSkillDrawTouchCancel, this); + this.skill_ad_refresh?.on(NodeEventType.TOUCH_START, this.onSkillAdDrawTouchStart, this); + this.skill_ad_refresh?.on(NodeEventType.TOUCH_END, this.onSkillAdDrawTouchEnd, this); + this.skill_ad_refresh?.on(NodeEventType.TOUCH_CANCEL, this.onSkillAdDrawTouchCancel, this); // this.cards_up?.on(NodeEventType.TOUCH_START, this.onUpgradeTouchStart, this); // this.cards_up?.on(NodeEventType.TOUCH_END, this.onUpgradeTouchEnd, this); // this.cards_up?.on(NodeEventType.TOUCH_CANCEL, this.onUpgradeTouchCancel, this); @@ -351,6 +368,34 @@ export class MissionCardComp extends CCComp { this.layoutCardSlots(); const cards = this.buildDrawCards(); this.dispatchCardsToSlots(cards); + + const wave = this.getCurrentWave(); + if ([1, 5, 10, 15, 20].includes(wave)) { + this.showSkillCardPopup(); + } + } + + private showSkillCardPopup() { + if (!this.skill_card_node) return; + this.skill_card_node.active = true; + const cards = this.buildSkillDrawCards(); + this.dispatchCardsToSkillSlots(cards); + } + + private dispatchCardsToSkillSlots(cards: CardConfig[]) { + if (!this.skillCardComps) return; + for (let i = 0; i < this.skillCardComps.length; i++) { + if (this.skillCardComps[i]) { + this.skillCardComps[i].applyDrawCard(cards[i] ?? null); + } + } + } + + private onUseSkillCard(event: string, args: any) { + // 选择技能后关闭弹窗 + if (this.skill_card_node && this.skill_card_node.isValid) { + this.skill_card_node.active = false; + } } /** 解除按钮监听，避免节点销毁后回调泄漏 */ @@ -360,6 +405,7 @@ export class MissionCardComp extends CCComp { oops.message.off(GameEvent.HeroDead, this.onHeroDead, this); oops.message.off(GameEvent.HeroSell, this.onHeroSell, this); oops.message.off(GameEvent.UseHeroCard, this.onUseHeroCard, this); + oops.message.off(GameEvent.UseSkillCard, this.onUseSkillCard, this); oops.message.off(GameEvent.UseSpecialCard, this.onUseSpecialCard, this); oops.message.off(GameEvent.CardPoolUpgrade, this.onCardPoolUpgrade, this); if (this.cards_chou && this.cards_chou.isValid) { @@ -367,6 +413,16 @@ export class MissionCardComp extends CCComp { this.cards_chou.off(NodeEventType.TOUCH_END, this.onDrawTouchEnd, this); this.cards_chou.off(NodeEventType.TOUCH_CANCEL, this.onDrawTouchCancel, this); } + if (this.skill_refresh && this.skill_refresh.isValid) { + this.skill_refresh.off(NodeEventType.TOUCH_START, this.onSkillDrawTouchStart, this); + this.skill_refresh.off(NodeEventType.TOUCH_END, this.onSkillDrawTouchEnd, this); + this.skill_refresh.off(NodeEventType.TOUCH_CANCEL, this.onSkillDrawTouchCancel, this); + } + if (this.skill_ad_refresh && this.skill_ad_refresh.isValid) { + this.skill_ad_refresh.off(NodeEventType.TOUCH_START, this.onSkillAdDrawTouchStart, this); + this.skill_ad_refresh.off(NodeEventType.TOUCH_END, this.onSkillAdDrawTouchEnd, this); + this.skill_ad_refresh.off(NodeEventType.TOUCH_CANCEL, this.onSkillAdDrawTouchCancel, this); + } // this.cards_up?.off(NodeEventType.TOUCH_START, this.onUpgradeTouchStart, this); // this.cards_up?.off(NodeEventType.TOUCH_END, this.onUpgradeTouchEnd, this); // this.cards_up?.off(NodeEventType.TOUCH_CANCEL, this.onUpgradeTouchCancel, this); @@ -522,6 +578,44 @@ export class MissionCardComp extends CCComp { private onDrawTouchCancel() { this.playButtonResetAnim(this.cards_chou); } + + // ======================== 技能抽卡按钮回调 ======================== + private onSkillDrawTouchStart() { + this.playButtonPressAnim(this.skill_refresh); + } + private onSkillDrawTouchEnd() { + this.playButtonClickAnim(this.skill_refresh, () => this.onClickSkillRefresh()); + } + private onSkillDrawTouchCancel() { + this.playButtonResetAnim(this.skill_refresh); + } + + private onSkillAdDrawTouchStart() { + this.playButtonPressAnim(this.skill_ad_refresh); + } + private onSkillAdDrawTouchEnd() { + this.playButtonClickAnim(this.skill_ad_refresh, () => this.onClickSkillAdRefresh()); + } + private onSkillAdDrawTouchCancel() { + this.playButtonResetAnim(this.skill_ad_refresh); + } + + private onClickSkillRefresh() { + const cost = MissionEconomy.getRefreshCost(this.refreshCost); + const success = MissionEconomy.executeRefresh(this.refreshCost); + if (!success) { + oops.gui.toast(`金币不足，刷新需要${cost}`); + return; + } + const cards = this.buildSkillDrawCards(); + this.dispatchCardsToSkillSlots(cards); + } + + private onClickSkillAdRefresh() { + // TODO: 接入广告 SDK 逻辑，目前先直接刷新 + const cards = this.buildSkillDrawCards(); + this.dispatchCardsToSkillSlots(cards); + } // /** 升级按钮按下反馈 */ // private onUpgradeTouchStart() { // this.playButtonPressAnim(this.cards_up); @@ -544,6 +638,11 @@ export class MissionCardComp extends CCComp { this.cardComps = nodes .map(node => node?.getComponent(CardComp)) .filter((comp): comp is CardComp => !!comp); + + const skillNodes = [this.skill_card1, this.skill_card2, this.skill_card3]; + this.skillCardComps = skillNodes + .map(node => node?.getComponent(CardComp)) + .filter((comp): comp is CardComp => !!comp); } // ======================== 核心业务：抽卡 & 升级 ======================== @@ -555,10 +654,10 @@ export class MissionCardComp extends CCComp { * 3. 重新布局槽位 → 从卡池构建 4 张卡 → 分发到槽位。 */ private onClickDraw() { - // if (this.isBattlePhase) { - // oops.gui.toast("战斗阶段无法抽卡"); - // return; - // } + if (this.isBattlePhase) { + oops.gui.toast("战斗阶段无法抽卡"); + return; + } const cost = MissionEconomy.getRefreshCost(this.refreshCost); const success = MissionEconomy.executeRefresh(this.refreshCost); if (!success) { @@ -631,11 +730,23 @@ export class MissionCardComp extends CCComp { this.cards_node.active = true; Tween.stopAllByTarget(this.cards_node); this.cards_node.setScale(this.cardsShowScale); + if (this.cards_chou && this.cards_chou.isValid) { + const nobg = this.cards_chou.getChildByName("nobg"); + if (nobg) { + nobg.active = !this.canDrawCards(); + } + } } private enterBattlePhase() { if (!this.cards_node || !this.cards_node.isValid) return; this.initCardsPanelPos(); + if (this.cards_chou && this.cards_chou.isValid) { + const nobg = this.cards_chou.getChildByName("nobg"); + if (nobg) { + nobg.active = true; + } + } // 战斗阶段不再隐藏抽卡面板 // Tween.stopAllByTarget(this.cards_node); // tween(this.cards_node) @@ -650,12 +761,7 @@ export class MissionCardComp extends CCComp { /** 构建本次抽卡结果，保证最终可分发3条数据 */ private buildDrawCards(): CardConfig[] { - let targetType: CardType | CardType[] | undefined = undefined; - if (this.isBattlePhase) { - targetType = CardType.Skill; - } else { - targetType = [CardType.Hero, CardType.SpecialRefresh]; - } + const targetType = [CardType.Hero, CardType.SpecialRefresh]; const cards = getCardsByLv(this.poolLv, targetType); /** 正常情况下直接取前3 */ @@ -670,6 +776,20 @@ export class MissionCardComp extends CCComp { return filled; } + private buildSkillDrawCards(): CardConfig[] { + const targetType = CardType.Skill; + const cards = getCardsByLv(this.poolLv, targetType); + + if (cards.length >= 3) return cards.slice(0, 3); + const filled = [...cards]; + while (filled.length < 3) { + const fallback = getCardsByLv(this.poolLv, targetType); + if (fallback.length === 0) break; + filled.push(fallback[filled.length % fallback.length]); + } + return filled; + } + private tryRefreshHeroCards(heroType?: HType, targetPoolLv?: number): boolean { const cards = drawCardsByRule(this.poolLv, { count: 3, @@ -716,6 +836,11 @@ export class MissionCardComp extends CCComp { this.cardComps.forEach(comp => { if (comp) comp.clearBySystem(); }); + if (this.skillCardComps) { + this.skillCardComps.forEach(comp => { + if (comp) comp.clearBySystem(); + }); + } } private layoutCardSlots() { @@ -808,15 +933,28 @@ export class MissionCardComp extends CCComp { } private updateDrawCostUI() { - if (!this.cards_chou) return; - const nobg = this.cards_chou.getChildByName("nobg"); - if (nobg) { - nobg.active = !this.canDrawCards(); + if (this.cards_chou) { + const nobg = this.cards_chou.getChildByName("nobg"); + if (nobg) { + nobg.active = this.isBattlePhase ? true : !this.canDrawCards(); + } + const coinNode = this.cards_chou.getChildByName("coin"); + const numLabel = coinNode?.getChildByName("num")?.getComponent(Label); + if (numLabel) { + numLabel.string = `${MissionEconomy.getRefreshCost(this.refreshCost)}`; + } } - const coinNode = this.cards_chou.getChildByName("coin"); - const numLabel = coinNode?.getChildByName("num")?.getComponent(Label); - if (numLabel) { - numLabel.string = `${MissionEconomy.getRefreshCost(this.refreshCost)}`; + + if (this.skill_refresh) { + const nobg = this.skill_refresh.getChildByName("nobg"); + if (nobg) { + nobg.active = !this.canDrawCards(); + } + const coinNode = this.skill_refresh.getChildByName("coin"); + const numLabel = coinNode?.getChildByName("num")?.getComponent(Label); + if (numLabel) { + numLabel.string = `${MissionEconomy.getRefreshCost(this.refreshCost)}`; + } } } @@ -1014,6 +1152,7 @@ export class MissionCardComp extends CCComp { // 关键：在 reset/销毁 时将 Map 置空，彻底切断引用 this.cardComps = [] as any; + this.skillCardComps = [] as any; if (this.node && this.node.isValid) { this.node.destroy(); diff --git a/assets/script/game/map/MissionComp.ts b/assets/script/game/map/MissionComp.ts index a8e71bd1..fbedc6b7 100644 --- a/assets/script/game/map/MissionComp.ts +++ b/assets/script/game/map/MissionComp.ts @@ -432,7 +432,11 @@ export class MissionComp extends CCComp { break; case MissionPhase.Prepare: - if (this.start_btn && this.start_btn.isValid) this.start_btn.active = true; + if (this.start_btn && this.start_btn.isValid) { + this.start_btn.active = true; + const nobg = this.start_btn.getChildByName("nobg"); + if (nobg) nobg.active = false; + } break; case MissionPhase.PrepareEnd: @@ -449,9 +453,10 @@ export class MissionComp extends CCComp { smc.mission.stop_spawn_mon = false; smc.mission.in_fight = true; smc.vmdata.mission_data.in_fight = true; - // 战斗阶段：隐藏开始按钮 + // 战斗阶段：不隐藏开始按钮，激活 nobg if (this.start_btn && this.start_btn.isValid) { - this.start_btn.active = false; + const nobg = this.start_btn.getChildByName("nobg"); + if (nobg) nobg.active = true; } oops.message.dispatchEvent(GameEvent.FightStart); break; @@ -505,7 +510,10 @@ export class MissionComp extends CCComp { smc.mission.in_fight = false; smc.vmdata.mission_data.in_fight = false; smc.mission.stop_spawn_mon = false; - if (this.start_btn && this.start_btn.isValid) this.start_btn.active = false; + if (this.start_btn && this.start_btn.isValid) { + const nobg = this.start_btn.getChildByName("nobg"); + if (nobg) nobg.active = true; + } break; }