From 051342a9c4d4b9a0892bc7f93b88b21a6ee40c8d Mon Sep 17 00:00:00 2001 From: panw Date: Fri, 24 Apr 2026 10:05:16 +0800 Subject: [PATCH] =?UTF-8?q?feat(ui):=20=E5=B0=86=E5=8D=A1=E7=89=8C?= =?UTF-8?q?=E6=A7=BD=E4=BD=8D=E4=BB=8E4=E4=B8=AA=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E4=B8=BA3=E4=B8=AA=E5=B9=B6=E6=9B=B4=E6=96=B0=E5=B8=83?= =?UTF-8?q?=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 隐藏第四个卡牌槽位,将抽卡逻辑从4张改为3张 - 调整卡牌预制体中的位置和尺寸以适配新布局 - 更新角色控制器UI的宽度和间距设置 - 修改卡牌放大时的位置判定阈值和高度 --- assets/resources/gui/element/card.prefab | 1117 +++++++++---------- assets/resources/gui/role_controller.prefab | 22 +- assets/script/game/map/CardComp.ts | 24 +- assets/script/game/map/MissionCardComp.ts | 26 +- 4 files changed, 535 insertions(+), 654 deletions(-) diff --git a/assets/resources/gui/element/card.prefab b/assets/resources/gui/element/card.prefab index 637aa21a..bba476b0 100644 --- a/assets/resources/gui/element/card.prefab +++ b/assets/resources/gui/element/card.prefab @@ -49,26 +49,26 @@ "__id__": 285 }, { - "__id__": 349 + "__id__": 343 }, { - "__id__": 371 + "__id__": 365 }, { - "__id__": 401 + "__id__": 395 } ], "_active": true, "_components": [ { - "__id__": 563 + "__id__": 557 }, { - "__id__": 565 + "__id__": 559 } ], "_prefab": { - "__id__": 567 + "__id__": 561 }, "_lpos": { "__type__": "cc.Vec3", @@ -3047,7 +3047,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -66.482, + "y": -70.781, "z": 0 }, "_lrot": { @@ -3185,7 +3185,7 @@ "_target": null, "_left": 0, "_right": 0, - "_top": 166.482, + "_top": 170.781, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -6442,28 +6442,25 @@ "__id__": 286 }, { - "__id__": 314 + "__id__": 312 } ], - "_active": false, + "_active": true, "_components": [ { - "__id__": 342 + "__id__": 338 }, { - "__id__": 344 - }, - { - "__id__": 346 + "__id__": 340 } ], "_prefab": { - "__id__": 348 + "__id__": 342 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 9.292000000000002, + "y": 31.641999999999996, "z": 0 }, "_lrot": { @@ -6515,17 +6512,14 @@ }, { "__id__": 309 - }, - { - "__id__": 311 } ], "_prefab": { - "__id__": 313 + "__id__": 311 }, "_lpos": { "__type__": "cc.Vec3", - "x": -52.5, + "x": -48.726, "y": 0, "z": 0 }, @@ -7095,42 +7089,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "47eq2qFINPbLbmViwVIdpU" }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 286 - }, - "_enabled": false, - "__prefab": { - "__id__": 312 - }, - "_alignFlags": 12, - "_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": 0, - "_originalHeight": 0, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "8cgm/puVdG05jG9VFTxrdZ" - }, { "__type__": "cc.PrefabInfo", "root": { @@ -7154,33 +7112,30 @@ }, "_children": [ { - "__id__": 315 + "__id__": 313 }, { - "__id__": 323 + "__id__": 321 }, { - "__id__": 329 + "__id__": 327 } ], "_active": true, "_components": [ + { + "__id__": 333 + }, { "__id__": 335 - }, - { - "__id__": 337 - }, - { - "__id__": 339 } ], "_prefab": { - "__id__": 341 + "__id__": 337 }, "_lpos": { "__type__": "cc.Vec3", - "x": 45.5, + "x": 49.274, "y": 0, "z": 0 }, @@ -7213,23 +7168,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 314 + "__id__": 312 }, "_children": [], "_active": true, "_components": [ + { + "__id__": 314 + }, { "__id__": 316 }, { "__id__": 318 - }, - { - "__id__": 320 } ], "_prefab": { - "__id__": 322 + "__id__": 320 }, "_lpos": { "__type__": "cc.Vec3", @@ -7266,11 +7221,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 315 + "__id__": 313 }, "_enabled": true, "__prefab": { - "__id__": 317 + "__id__": 315 }, "_contentSize": { "__type__": "cc.Size", @@ -7294,11 +7249,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 315 + "__id__": 313 }, "_enabled": true, "__prefab": { - "__id__": 319 + "__id__": 317 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7339,11 +7294,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 315 + "__id__": 313 }, "_enabled": true, "__prefab": { - "__id__": 321 + "__id__": 319 }, "_alignFlags": 45, "_target": null, @@ -7388,20 +7343,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 314 + "__id__": 312 }, "_children": [], "_active": true, "_components": [ { - "__id__": 324 + "__id__": 322 }, { - "__id__": 326 + "__id__": 324 } ], "_prefab": { - "__id__": 328 + "__id__": 326 }, "_lpos": { "__type__": "cc.Vec3", @@ -7438,11 +7393,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 323 + "__id__": 321 }, "_enabled": true, "__prefab": { - "__id__": 325 + "__id__": 323 }, "_contentSize": { "__type__": "cc.Size", @@ -7466,11 +7421,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 323 + "__id__": 321 }, "_enabled": true, "__prefab": { - "__id__": 327 + "__id__": 325 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7524,20 +7479,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 314 + "__id__": 312 }, "_children": [], "_active": true, "_components": [ { - "__id__": 330 + "__id__": 328 }, { - "__id__": 332 + "__id__": 330 } ], "_prefab": { - "__id__": 334 + "__id__": 332 }, "_lpos": { "__type__": "cc.Vec3", @@ -7574,11 +7529,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 329 + "__id__": 327 }, "_enabled": true, "__prefab": { - "__id__": 331 + "__id__": 329 }, "_contentSize": { "__type__": "cc.Size", @@ -7602,11 +7557,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 329 + "__id__": 327 }, "_enabled": true, "__prefab": { - "__id__": 333 + "__id__": 331 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7683,11 +7638,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 314 + "__id__": 312 }, "_enabled": true, "__prefab": { - "__id__": 336 + "__id__": 334 }, "_contentSize": { "__type__": "cc.Size", @@ -7711,11 +7666,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 314 + "__id__": 312 }, "_enabled": false, "__prefab": { - "__id__": 338 + "__id__": 336 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7750,42 +7705,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "9ddTg0By1KM4blw+DZdYTY" }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 314 - }, - "_enabled": false, - "__prefab": { - "__id__": 340 - }, - "_alignFlags": 12, - "_target": null, - "_left": 0, - "_right": 0, - "_top": 0, - "_bottom": -30, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 0, - "_originalHeight": 0, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "62/icSOIFNapPUPAPe4WwM" - }, { "__type__": "cc.PrefabInfo", "root": { @@ -7809,7 +7728,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 343 + "__id__": 339 }, "_contentSize": { "__type__": "cc.Size", @@ -7835,16 +7754,16 @@ "node": { "__id__": 285 }, - "_enabled": true, + "_enabled": false, "__prefab": { - "__id__": 345 + "__id__": 341 }, "_alignFlags": 20, "_target": null, "_left": 15, "_right": 15, "_top": 160, - "_bottom": 109.292, + "_bottom": 131.642, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -7863,44 +7782,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "23FrXN9T9O2ITB7cph0Bkr" }, - { - "__type__": "cc.Layout", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 285 - }, - "_enabled": true, - "__prefab": { - "__id__": 347 - }, - "_resizeMode": 0, - "_layoutType": 3, - "_cellSize": { - "__type__": "cc.Size", - "width": 40, - "height": 40 - }, - "_startAxis": 0, - "_paddingLeft": 0, - "_paddingRight": 0, - "_paddingTop": 0, - "_paddingBottom": 0, - "_spacingX": 3, - "_spacingY": 0, - "_verticalDirection": 1, - "_horizontalDirection": 0, - "_constraint": 0, - "_constraintNum": 2, - "_affectedByScale": false, - "_isAlign": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "baQdRvRhRHGbAw9O8uHZ5f" - }, { "__type__": "cc.PrefabInfo", "root": { @@ -7924,28 +7805,28 @@ }, "_children": [ { - "__id__": 350 + "__id__": 344 }, { - "__id__": 358 + "__id__": 352 } ], "_active": false, "_components": [ { - "__id__": 366 + "__id__": 360 }, { - "__id__": 368 + "__id__": 362 } ], "_prefab": { - "__id__": 370 + "__id__": 364 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -84.997, + "y": -93.593, "z": 0 }, "_lrot": { @@ -7977,23 +7858,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 349 + "__id__": 343 }, "_children": [], "_active": true, "_components": [ { - "__id__": 351 + "__id__": 345 }, { - "__id__": 353 + "__id__": 347 }, { - "__id__": 355 + "__id__": 349 } ], "_prefab": { - "__id__": 357 + "__id__": 351 }, "_lpos": { "__type__": "cc.Vec3", @@ -8030,16 +7911,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 350 + "__id__": 344 }, "_enabled": true, "__prefab": { - "__id__": 352 + "__id__": 346 }, "_contentSize": { "__type__": "cc.Size", "width": 200, - "height": 85 + "height": 110 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -8058,11 +7939,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 350 + "__id__": 344 }, "_enabled": true, "__prefab": { - "__id__": 354 + "__id__": 348 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8103,11 +7984,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 350 + "__id__": 344 }, "_enabled": true, "__prefab": { - "__id__": 356 + "__id__": 350 }, "_alignFlags": 45, "_target": null, @@ -8152,23 +8033,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 349 + "__id__": 343 }, "_children": [], "_active": true, "_components": [ { - "__id__": 359 + "__id__": 353 }, { - "__id__": 361 + "__id__": 355 }, { - "__id__": 363 + "__id__": 357 } ], "_prefab": { - "__id__": 365 + "__id__": 359 }, "_lpos": { "__type__": "cc.Vec3", @@ -8205,16 +8086,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 358 + "__id__": 352 }, "_enabled": true, "__prefab": { - "__id__": 360 + "__id__": 354 }, "_contentSize": { "__type__": "cc.Size", "width": 200, - "height": 85 + "height": 110 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -8233,11 +8114,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 358 + "__id__": 352 }, "_enabled": true, "__prefab": { - "__id__": 362 + "__id__": 356 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8301,11 +8182,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 358 + "__id__": 352 }, "_enabled": true, "__prefab": { - "__id__": 364 + "__id__": 358 }, "_alignFlags": 45, "_target": null, @@ -8350,16 +8231,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 349 + "__id__": 343 }, "_enabled": true, "__prefab": { - "__id__": 367 + "__id__": 361 }, "_contentSize": { "__type__": "cc.Size", "width": 200, - "height": 85 + "height": 110 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -8378,11 +8259,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 349 + "__id__": 343 }, "_enabled": true, "__prefab": { - "__id__": 369 + "__id__": 363 }, "_alignFlags": 16, "_target": null, @@ -8430,6 +8311,9 @@ "__id__": 1 }, "_children": [ + { + "__id__": 366 + }, { "__id__": 372 }, @@ -8438,22 +8322,19 @@ }, { "__id__": 384 - }, - { - "__id__": 390 } ], "_active": false, "_components": [ { - "__id__": 396 + "__id__": 390 }, { - "__id__": 398 + "__id__": 392 } ], "_prefab": { - "__id__": 400 + "__id__": 394 }, "_lpos": { "__type__": "cc.Vec3", @@ -8490,8 +8371,144 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { + "__id__": 365 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 367 + }, + { + "__id__": 369 + } + ], + "_prefab": { "__id__": 371 }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 0.4, + "y": 0.4, + "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__": 366 + }, + "_enabled": true, + "__prefab": { + "__id__": 368 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 120, + "height": 106 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "b9X00YJSVF9r6efaMtLkI3" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 366 + }, + "_enabled": true, + "__prefab": { + "__id__": 370 + }, + "_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@8429c", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "ef8/ldQE5CGbB0s4CfTRwE" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "f3MmyLb9lML5mXGMUZsqPK", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "Card", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 365 + }, "_children": [], "_active": true, "_components": [ @@ -8546,142 +8563,6 @@ "__prefab": { "__id__": 374 }, - "_contentSize": { - "__type__": "cc.Size", - "width": 120, - "height": 106 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b9X00YJSVF9r6efaMtLkI3" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 372 - }, - "_enabled": true, - "__prefab": { - "__id__": 376 - }, - "_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@8429c", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 1, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "ef8/ldQE5CGbB0s4CfTRwE" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "f3MmyLb9lML5mXGMUZsqPK", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "Card", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 371 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 379 - }, - { - "__id__": 381 - } - ], - "_prefab": { - "__id__": 383 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 0.4, - "y": 0.4, - "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__": 378 - }, - "_enabled": true, - "__prefab": { - "__id__": 380 - }, "_contentSize": { "__type__": "cc.Size", "width": 120, @@ -8704,11 +8585,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 378 + "__id__": 372 }, "_enabled": true, "__prefab": { - "__id__": 382 + "__id__": 376 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8765,20 +8646,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 371 + "__id__": 365 }, "_children": [], "_active": true, "_components": [ { - "__id__": 385 + "__id__": 379 }, { - "__id__": 387 + "__id__": 381 } ], "_prefab": { - "__id__": 389 + "__id__": 383 }, "_lpos": { "__type__": "cc.Vec3", @@ -8815,11 +8696,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 384 + "__id__": 378 }, "_enabled": true, "__prefab": { - "__id__": 386 + "__id__": 380 }, "_contentSize": { "__type__": "cc.Size", @@ -8843,11 +8724,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 384 + "__id__": 378 }, "_enabled": true, "__prefab": { - "__id__": 388 + "__id__": 382 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8904,20 +8785,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 371 + "__id__": 365 }, "_children": [], "_active": true, "_components": [ { - "__id__": 391 + "__id__": 385 }, { - "__id__": 393 + "__id__": 387 } ], "_prefab": { - "__id__": 395 + "__id__": 389 }, "_lpos": { "__type__": "cc.Vec3", @@ -8954,11 +8835,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 390 + "__id__": 384 }, "_enabled": true, "__prefab": { - "__id__": 392 + "__id__": 386 }, "_contentSize": { "__type__": "cc.Size", @@ -8982,11 +8863,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 390 + "__id__": 384 }, "_enabled": true, "__prefab": { - "__id__": 394 + "__id__": 388 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9043,11 +8924,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 371 + "__id__": 365 }, "_enabled": true, "__prefab": { - "__id__": 397 + "__id__": 391 }, "_contentSize": { "__type__": "cc.Size", @@ -9071,11 +8952,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 371 + "__id__": 365 }, "_enabled": true, "__prefab": { - "__id__": 399 + "__id__": 393 }, "_alignFlags": 33, "_target": null, @@ -9123,39 +9004,39 @@ "__id__": 1 }, "_children": [ + { + "__id__": 396 + }, { "__id__": 402 }, { - "__id__": 408 + "__id__": 412 }, { - "__id__": 418 + "__id__": 428 }, { - "__id__": 434 + "__id__": 450 }, { - "__id__": 456 + "__id__": 478 }, { - "__id__": 484 - }, - { - "__id__": 518 + "__id__": 512 } ], "_active": true, "_components": [ { - "__id__": 558 + "__id__": 552 }, { - "__id__": 560 + "__id__": 554 } ], "_prefab": { - "__id__": 562 + "__id__": 556 }, "_lpos": { "__type__": "cc.Vec3", @@ -9192,20 +9073,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 401 + "__id__": 395 }, "_children": [], "_active": true, "_components": [ { - "__id__": 403 + "__id__": 397 }, { - "__id__": 405 + "__id__": 399 } ], "_prefab": { - "__id__": 407 + "__id__": 401 }, "_lpos": { "__type__": "cc.Vec3", @@ -9242,11 +9123,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 402 + "__id__": 396 }, "_enabled": true, "__prefab": { - "__id__": 404 + "__id__": 398 }, "_contentSize": { "__type__": "cc.Size", @@ -9270,11 +9151,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 402 + "__id__": 396 }, "_enabled": true, "__prefab": { - "__id__": 406 + "__id__": 400 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9328,21 +9209,21 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 401 + "__id__": 395 }, "_children": [ { - "__id__": 409 + "__id__": 403 } ], "_active": true, "_components": [ { - "__id__": 415 + "__id__": 409 } ], "_prefab": { - "__id__": 417 + "__id__": 411 }, "_lpos": { "__type__": "cc.Vec3", @@ -9379,20 +9260,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 408 + "__id__": 402 }, "_children": [], "_active": true, "_components": [ { - "__id__": 410 + "__id__": 404 }, { - "__id__": 412 + "__id__": 406 } ], "_prefab": { - "__id__": 414 + "__id__": 408 }, "_lpos": { "__type__": "cc.Vec3", @@ -9429,11 +9310,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 409 + "__id__": 403 }, "_enabled": true, "__prefab": { - "__id__": 411 + "__id__": 405 }, "_contentSize": { "__type__": "cc.Size", @@ -9457,11 +9338,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 409 + "__id__": 403 }, "_enabled": true, "__prefab": { - "__id__": 413 + "__id__": 407 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9515,11 +9396,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 408 + "__id__": 402 }, "_enabled": true, "__prefab": { - "__id__": 416 + "__id__": 410 }, "_contentSize": { "__type__": "cc.Size", @@ -9556,24 +9437,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 401 + "__id__": 395 }, "_children": [ { - "__id__": 419 + "__id__": 413 }, { - "__id__": 425 + "__id__": 419 } ], "_active": true, "_components": [ { - "__id__": 431 + "__id__": 425 } ], "_prefab": { - "__id__": 433 + "__id__": 427 }, "_lpos": { "__type__": "cc.Vec3", @@ -9610,20 +9491,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 418 + "__id__": 412 }, "_children": [], "_active": true, "_components": [ { - "__id__": 420 + "__id__": 414 }, { - "__id__": 422 + "__id__": 416 } ], "_prefab": { - "__id__": 424 + "__id__": 418 }, "_lpos": { "__type__": "cc.Vec3", @@ -9660,11 +9541,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 419 + "__id__": 413 }, "_enabled": true, "__prefab": { - "__id__": 421 + "__id__": 415 }, "_contentSize": { "__type__": "cc.Size", @@ -9688,11 +9569,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 419 + "__id__": 413 }, "_enabled": true, "__prefab": { - "__id__": 423 + "__id__": 417 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9746,20 +9627,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 418 + "__id__": 412 }, "_children": [], "_active": true, "_components": [ { - "__id__": 426 + "__id__": 420 }, { - "__id__": 428 + "__id__": 422 } ], "_prefab": { - "__id__": 430 + "__id__": 424 }, "_lpos": { "__type__": "cc.Vec3", @@ -9796,11 +9677,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 425 + "__id__": 419 }, "_enabled": true, "__prefab": { - "__id__": 427 + "__id__": 421 }, "_contentSize": { "__type__": "cc.Size", @@ -9824,11 +9705,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 425 + "__id__": 419 }, "_enabled": true, "__prefab": { - "__id__": 429 + "__id__": 423 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9882,11 +9763,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 418 + "__id__": 412 }, "_enabled": true, "__prefab": { - "__id__": 432 + "__id__": 426 }, "_contentSize": { "__type__": "cc.Size", @@ -9923,27 +9804,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 401 + "__id__": 395 }, "_children": [ + { + "__id__": 429 + }, { "__id__": 435 }, { "__id__": 441 - }, - { - "__id__": 447 } ], "_active": true, "_components": [ { - "__id__": 453 + "__id__": 447 } ], "_prefab": { - "__id__": 455 + "__id__": 449 }, "_lpos": { "__type__": "cc.Vec3", @@ -9980,20 +9861,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 434 + "__id__": 428 }, "_children": [], "_active": true, "_components": [ { - "__id__": 436 + "__id__": 430 }, { - "__id__": 438 + "__id__": 432 } ], "_prefab": { - "__id__": 440 + "__id__": 434 }, "_lpos": { "__type__": "cc.Vec3", @@ -10030,11 +9911,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 435 + "__id__": 429 }, "_enabled": true, "__prefab": { - "__id__": 437 + "__id__": 431 }, "_contentSize": { "__type__": "cc.Size", @@ -10058,11 +9939,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 435 + "__id__": 429 }, "_enabled": true, "__prefab": { - "__id__": 439 + "__id__": 433 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10116,20 +9997,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 434 + "__id__": 428 }, "_children": [], "_active": true, "_components": [ { - "__id__": 442 + "__id__": 436 }, { - "__id__": 444 + "__id__": 438 } ], "_prefab": { - "__id__": 446 + "__id__": 440 }, "_lpos": { "__type__": "cc.Vec3", @@ -10166,11 +10047,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 441 + "__id__": 435 }, "_enabled": true, "__prefab": { - "__id__": 443 + "__id__": 437 }, "_contentSize": { "__type__": "cc.Size", @@ -10194,11 +10075,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 441 + "__id__": 435 }, "_enabled": true, "__prefab": { - "__id__": 445 + "__id__": 439 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10252,20 +10133,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 434 + "__id__": 428 }, "_children": [], "_active": true, "_components": [ { - "__id__": 448 + "__id__": 442 }, { - "__id__": 450 + "__id__": 444 } ], "_prefab": { - "__id__": 452 + "__id__": 446 }, "_lpos": { "__type__": "cc.Vec3", @@ -10302,11 +10183,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 447 + "__id__": 441 }, "_enabled": true, "__prefab": { - "__id__": 449 + "__id__": 443 }, "_contentSize": { "__type__": "cc.Size", @@ -10330,11 +10211,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 447 + "__id__": 441 }, "_enabled": true, "__prefab": { - "__id__": 451 + "__id__": 445 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10388,11 +10269,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 434 + "__id__": 428 }, "_enabled": true, "__prefab": { - "__id__": 454 + "__id__": 448 }, "_contentSize": { "__type__": "cc.Size", @@ -10429,9 +10310,12 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 401 + "__id__": 395 }, "_children": [ + { + "__id__": 451 + }, { "__id__": 457 }, @@ -10440,19 +10324,16 @@ }, { "__id__": 469 - }, - { - "__id__": 475 } ], "_active": true, "_components": [ { - "__id__": 481 + "__id__": 475 } ], "_prefab": { - "__id__": 483 + "__id__": 477 }, "_lpos": { "__type__": "cc.Vec3", @@ -10489,20 +10370,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 456 + "__id__": 450 }, "_children": [], "_active": true, "_components": [ { - "__id__": 458 + "__id__": 452 }, { - "__id__": 460 + "__id__": 454 } ], "_prefab": { - "__id__": 462 + "__id__": 456 }, "_lpos": { "__type__": "cc.Vec3", @@ -10539,11 +10420,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 457 + "__id__": 451 }, "_enabled": true, "__prefab": { - "__id__": 459 + "__id__": 453 }, "_contentSize": { "__type__": "cc.Size", @@ -10567,11 +10448,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 457 + "__id__": 451 }, "_enabled": true, "__prefab": { - "__id__": 461 + "__id__": 455 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10625,20 +10506,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 456 + "__id__": 450 }, "_children": [], "_active": true, "_components": [ { - "__id__": 464 + "__id__": 458 }, { - "__id__": 466 + "__id__": 460 } ], "_prefab": { - "__id__": 468 + "__id__": 462 }, "_lpos": { "__type__": "cc.Vec3", @@ -10675,11 +10556,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 463 + "__id__": 457 }, "_enabled": true, "__prefab": { - "__id__": 465 + "__id__": 459 }, "_contentSize": { "__type__": "cc.Size", @@ -10703,11 +10584,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 463 + "__id__": 457 }, "_enabled": true, "__prefab": { - "__id__": 467 + "__id__": 461 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10761,20 +10642,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 456 + "__id__": 450 }, "_children": [], "_active": true, "_components": [ { - "__id__": 470 + "__id__": 464 }, { - "__id__": 472 + "__id__": 466 } ], "_prefab": { - "__id__": 474 + "__id__": 468 }, "_lpos": { "__type__": "cc.Vec3", @@ -10811,11 +10692,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 469 + "__id__": 463 }, "_enabled": true, "__prefab": { - "__id__": 471 + "__id__": 465 }, "_contentSize": { "__type__": "cc.Size", @@ -10839,11 +10720,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 469 + "__id__": 463 }, "_enabled": true, "__prefab": { - "__id__": 473 + "__id__": 467 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10897,20 +10778,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 456 + "__id__": 450 }, "_children": [], "_active": true, "_components": [ { - "__id__": 476 + "__id__": 470 }, { - "__id__": 478 + "__id__": 472 } ], "_prefab": { - "__id__": 480 + "__id__": 474 }, "_lpos": { "__type__": "cc.Vec3", @@ -10947,11 +10828,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 475 + "__id__": 469 }, "_enabled": true, "__prefab": { - "__id__": 477 + "__id__": 471 }, "_contentSize": { "__type__": "cc.Size", @@ -10975,11 +10856,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 475 + "__id__": 469 }, "_enabled": true, "__prefab": { - "__id__": 479 + "__id__": 473 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11033,11 +10914,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 456 + "__id__": 450 }, "_enabled": true, "__prefab": { - "__id__": 482 + "__id__": 476 }, "_contentSize": { "__type__": "cc.Size", @@ -11074,9 +10955,12 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 401 + "__id__": 395 }, "_children": [ + { + "__id__": 479 + }, { "__id__": 485 }, @@ -11088,19 +10972,16 @@ }, { "__id__": 503 - }, - { - "__id__": 509 } ], "_active": true, "_components": [ { - "__id__": 515 + "__id__": 509 } ], "_prefab": { - "__id__": 517 + "__id__": 511 }, "_lpos": { "__type__": "cc.Vec3", @@ -11137,20 +11018,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 484 + "__id__": 478 }, "_children": [], "_active": true, "_components": [ { - "__id__": 486 + "__id__": 480 }, { - "__id__": 488 + "__id__": 482 } ], "_prefab": { - "__id__": 490 + "__id__": 484 }, "_lpos": { "__type__": "cc.Vec3", @@ -11187,11 +11068,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 485 + "__id__": 479 }, "_enabled": true, "__prefab": { - "__id__": 487 + "__id__": 481 }, "_contentSize": { "__type__": "cc.Size", @@ -11215,11 +11096,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 485 + "__id__": 479 }, "_enabled": true, "__prefab": { - "__id__": 489 + "__id__": 483 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11273,20 +11154,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 484 + "__id__": 478 }, "_children": [], "_active": true, "_components": [ { - "__id__": 492 + "__id__": 486 }, { - "__id__": 494 + "__id__": 488 } ], "_prefab": { - "__id__": 496 + "__id__": 490 }, "_lpos": { "__type__": "cc.Vec3", @@ -11323,11 +11204,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 491 + "__id__": 485 }, "_enabled": true, "__prefab": { - "__id__": 493 + "__id__": 487 }, "_contentSize": { "__type__": "cc.Size", @@ -11351,11 +11232,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 491 + "__id__": 485 }, "_enabled": true, "__prefab": { - "__id__": 495 + "__id__": 489 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11409,20 +11290,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 484 + "__id__": 478 }, "_children": [], "_active": true, "_components": [ { - "__id__": 498 + "__id__": 492 }, { - "__id__": 500 + "__id__": 494 } ], "_prefab": { - "__id__": 502 + "__id__": 496 }, "_lpos": { "__type__": "cc.Vec3", @@ -11459,11 +11340,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 497 + "__id__": 491 }, "_enabled": true, "__prefab": { - "__id__": 499 + "__id__": 493 }, "_contentSize": { "__type__": "cc.Size", @@ -11487,11 +11368,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 497 + "__id__": 491 }, "_enabled": true, "__prefab": { - "__id__": 501 + "__id__": 495 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11545,20 +11426,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 484 + "__id__": 478 }, "_children": [], "_active": true, "_components": [ { - "__id__": 504 + "__id__": 498 }, { - "__id__": 506 + "__id__": 500 } ], "_prefab": { - "__id__": 508 + "__id__": 502 }, "_lpos": { "__type__": "cc.Vec3", @@ -11595,11 +11476,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 503 + "__id__": 497 }, "_enabled": true, "__prefab": { - "__id__": 505 + "__id__": 499 }, "_contentSize": { "__type__": "cc.Size", @@ -11623,11 +11504,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 503 + "__id__": 497 }, "_enabled": true, "__prefab": { - "__id__": 507 + "__id__": 501 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11681,20 +11562,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 484 + "__id__": 478 }, "_children": [], "_active": true, "_components": [ { - "__id__": 510 + "__id__": 504 }, { - "__id__": 512 + "__id__": 506 } ], "_prefab": { - "__id__": 514 + "__id__": 508 }, "_lpos": { "__type__": "cc.Vec3", @@ -11731,11 +11612,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 509 + "__id__": 503 }, "_enabled": true, "__prefab": { - "__id__": 511 + "__id__": 505 }, "_contentSize": { "__type__": "cc.Size", @@ -11759,11 +11640,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 509 + "__id__": 503 }, "_enabled": true, "__prefab": { - "__id__": 513 + "__id__": 507 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11817,11 +11698,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 484 + "__id__": 478 }, "_enabled": true, "__prefab": { - "__id__": 516 + "__id__": 510 }, "_contentSize": { "__type__": "cc.Size", @@ -11858,9 +11739,12 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 401 + "__id__": 395 }, "_children": [ + { + "__id__": 513 + }, { "__id__": 519 }, @@ -11875,19 +11759,16 @@ }, { "__id__": 543 - }, - { - "__id__": 549 } ], "_active": true, "_components": [ { - "__id__": 555 + "__id__": 549 } ], "_prefab": { - "__id__": 557 + "__id__": 551 }, "_lpos": { "__type__": "cc.Vec3", @@ -11924,20 +11805,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 518 + "__id__": 512 }, "_children": [], "_active": true, "_components": [ { - "__id__": 520 + "__id__": 514 }, { - "__id__": 522 + "__id__": 516 } ], "_prefab": { - "__id__": 524 + "__id__": 518 }, "_lpos": { "__type__": "cc.Vec3", @@ -11974,11 +11855,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 519 + "__id__": 513 }, "_enabled": true, "__prefab": { - "__id__": 521 + "__id__": 515 }, "_contentSize": { "__type__": "cc.Size", @@ -12002,11 +11883,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 519 + "__id__": 513 }, "_enabled": true, "__prefab": { - "__id__": 523 + "__id__": 517 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12060,20 +11941,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 518 + "__id__": 512 }, "_children": [], "_active": true, "_components": [ { - "__id__": 526 + "__id__": 520 }, { - "__id__": 528 + "__id__": 522 } ], "_prefab": { - "__id__": 530 + "__id__": 524 }, "_lpos": { "__type__": "cc.Vec3", @@ -12110,11 +11991,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 525 + "__id__": 519 }, "_enabled": true, "__prefab": { - "__id__": 527 + "__id__": 521 }, "_contentSize": { "__type__": "cc.Size", @@ -12138,11 +12019,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 525 + "__id__": 519 }, "_enabled": true, "__prefab": { - "__id__": 529 + "__id__": 523 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12196,20 +12077,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 518 + "__id__": 512 }, "_children": [], "_active": true, "_components": [ { - "__id__": 532 + "__id__": 526 }, { - "__id__": 534 + "__id__": 528 } ], "_prefab": { - "__id__": 536 + "__id__": 530 }, "_lpos": { "__type__": "cc.Vec3", @@ -12246,11 +12127,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 531 + "__id__": 525 }, "_enabled": true, "__prefab": { - "__id__": 533 + "__id__": 527 }, "_contentSize": { "__type__": "cc.Size", @@ -12274,11 +12155,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 531 + "__id__": 525 }, "_enabled": true, "__prefab": { - "__id__": 535 + "__id__": 529 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12332,20 +12213,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 518 + "__id__": 512 }, "_children": [], "_active": true, "_components": [ { - "__id__": 538 + "__id__": 532 }, { - "__id__": 540 + "__id__": 534 } ], "_prefab": { - "__id__": 542 + "__id__": 536 }, "_lpos": { "__type__": "cc.Vec3", @@ -12382,11 +12263,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 537 + "__id__": 531 }, "_enabled": true, "__prefab": { - "__id__": 539 + "__id__": 533 }, "_contentSize": { "__type__": "cc.Size", @@ -12410,11 +12291,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 537 + "__id__": 531 }, "_enabled": true, "__prefab": { - "__id__": 541 + "__id__": 535 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12468,20 +12349,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 518 + "__id__": 512 }, "_children": [], "_active": true, "_components": [ { - "__id__": 544 + "__id__": 538 }, { - "__id__": 546 + "__id__": 540 } ], "_prefab": { - "__id__": 548 + "__id__": 542 }, "_lpos": { "__type__": "cc.Vec3", @@ -12518,11 +12399,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 543 + "__id__": 537 }, "_enabled": true, "__prefab": { - "__id__": 545 + "__id__": 539 }, "_contentSize": { "__type__": "cc.Size", @@ -12546,11 +12427,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 543 + "__id__": 537 }, "_enabled": true, "__prefab": { - "__id__": 547 + "__id__": 541 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12604,20 +12485,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 518 + "__id__": 512 }, "_children": [], "_active": true, "_components": [ { - "__id__": 550 + "__id__": 544 }, { - "__id__": 552 + "__id__": 546 } ], "_prefab": { - "__id__": 554 + "__id__": 548 }, "_lpos": { "__type__": "cc.Vec3", @@ -12654,11 +12535,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 549 + "__id__": 543 }, "_enabled": true, "__prefab": { - "__id__": 551 + "__id__": 545 }, "_contentSize": { "__type__": "cc.Size", @@ -12682,11 +12563,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 549 + "__id__": 543 }, "_enabled": true, "__prefab": { - "__id__": 553 + "__id__": 547 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12740,11 +12621,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 518 + "__id__": 512 }, "_enabled": true, "__prefab": { - "__id__": 556 + "__id__": 550 }, "_contentSize": { "__type__": "cc.Size", @@ -12781,11 +12662,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 401 + "__id__": 395 }, "_enabled": true, "__prefab": { - "__id__": 559 + "__id__": 553 }, "_contentSize": { "__type__": "cc.Size", @@ -12809,11 +12690,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 401 + "__id__": 395 }, "_enabled": true, "__prefab": { - "__id__": 561 + "__id__": 555 }, "_alignFlags": 9, "_target": null, @@ -12862,7 +12743,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 564 + "__id__": 558 }, "_contentSize": { "__type__": "cc.Size", @@ -12890,7 +12771,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 566 + "__id__": 560 }, "Lock": null, "unLock": null, @@ -12898,7 +12779,7 @@ "__id__": 285 }, "oinfo_node": { - "__id__": 349 + "__id__": 343 }, "name_node": { "__id__": 132 @@ -12910,7 +12791,7 @@ "__id__": 265 }, "Ckind_node": { - "__id__": 371 + "__id__": 365 }, "BG_node": { "__id__": 10 @@ -12922,7 +12803,7 @@ "__id__": 194 }, "lv_node": { - "__id__": 401 + "__id__": 395 }, "_id": "" }, diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index 90e3fed1..250f59c1 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -14093,7 +14093,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 320, + "width": 220, "height": 150 }, "_anchorPoint": { @@ -14127,11 +14127,11 @@ "height": 40 }, "_startAxis": 0, - "_paddingLeft": 100, + "_paddingLeft": 0, "_paddingRight": 0, "_paddingTop": 0, "_paddingBottom": 0, - "_spacingX": 50, + "_spacingX": 0, "_spacingY": 0, "_verticalDirection": 1, "_horizontalDirection": 0, @@ -14159,8 +14159,8 @@ }, "_alignFlags": 44, "_target": null, - "_left": 200, - "_right": 200, + "_left": 250, + "_right": 250, "_top": 1230, "_bottom": 7.988, "_horizontalCenter": 0, @@ -15364,7 +15364,7 @@ "__id__": 965 } ], - "_active": false, + "_active": true, "_components": [ { "__id__": 982 @@ -20058,8 +20058,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 134.7058823529412, - "height": 57.64705882352941 + "width": 252.3529411764706, + "height": 104.70588235294117 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -20183,8 +20183,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 300, - "height": 120 + "width": 500, + "height": 200 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -20284,7 +20284,7 @@ "_left": 0, "_right": 0, "_top": 0, - "_bottom": 280.807, + "_bottom": 240.80700000000002, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, diff --git a/assets/script/game/map/CardComp.ts b/assets/script/game/map/CardComp.ts index 8d01096a..e4dc1daf 100644 --- a/assets/script/game/map/CardComp.ts +++ b/assets/script/game/map/CardComp.ts @@ -416,7 +416,7 @@ export class CardComp extends CCComp { // x轴偏移逻辑 if (this.restPosition.x < -200) { // -260 targetX = this.restPosition.x + 30; - } else if (this.restPosition.x > 200) { // 260 + } else if (this.restPosition.x > 80) { // 260 -> 86也算 targetX = this.restPosition.x - 30; } // y轴变大时 +35 @@ -549,7 +549,7 @@ export class CardComp extends CCComp { if (this.isEnlarged) { if (this.restPosition.x <= -200) { baseX = this.restPosition.x + 30; - } else if (this.restPosition.x >= 200) { + } else if (this.restPosition.x >= 80) { baseX = this.restPosition.x - 30; } baseY = this.restPosition.y + 35; @@ -657,7 +657,7 @@ export class CardComp extends CCComp { this.node.setSiblingIndex(99); // 变大时提到最前 if (this.restPosition.x <= -200) { // -260 targetX = this.restPosition.x + 30; - } else if (this.restPosition.x >= 200) { // 260 + } else if (this.restPosition.x >= 80) { // 260 -> 86也算 targetX = this.restPosition.x - 30; } targetY = this.restPosition.y + 35; // y轴增加 @@ -705,7 +705,7 @@ export class CardComp extends CCComp { // ---- 按卡牌类型渲染具体内容 ---- const uiTrans = this.node.getComponent(UITransform); if (uiTrans) { - uiTrans.setContentSize(this.isEnlarged ? 230 : 170, this.isEnlarged ? 300 : 230); + uiTrans.setContentSize(this.isEnlarged ? 230 : 170, this.isEnlarged ? 340 : 230); const widget = this.node.getComponent(Widget); if (widget) widget.updateAlignment(); } @@ -714,14 +714,14 @@ export class CardComp extends CCComp { if (this.BG_node) { const bgTrans = this.BG_node.getComponent(UITransform); if (bgTrans) { - bgTrans.setContentSize(this.isEnlarged ? 230 : 170, this.isEnlarged ? 300 : 230); + bgTrans.setContentSize(this.isEnlarged ? 230 : 170, this.isEnlarged ? 340 : 230); const widget = this.BG_node.getComponent(Widget); if (widget) widget.updateAlignment(); } this.BG_node.children.forEach(child => { const childTrans = child.getComponent(UITransform); if (childTrans) { - childTrans.setContentSize(this.isEnlarged ? 230 : 170, this.isEnlarged ? 300 : 230); + childTrans.setContentSize(this.isEnlarged ? 230 : 170, this.isEnlarged ? 340 : 230); const widget = child.getComponent(Widget); if (widget) widget.updateAlignment(); } @@ -741,14 +741,14 @@ export class CardComp extends CCComp { if (this.HF_node) { const hfTrans = this.HF_node.getComponent(UITransform); if (hfTrans) { - hfTrans.setContentSize(this.isEnlarged ? 230 : 170, this.isEnlarged ? 300 : 230); + hfTrans.setContentSize(this.isEnlarged ? 230 : 170, this.isEnlarged ? 340 : 230); const widget = this.HF_node.getComponent(Widget); if (widget) widget.updateAlignment(); } this.HF_node.children.forEach(child => { const childTrans = child.getComponent(UITransform); if (childTrans) { - childTrans.setContentSize(this.isEnlarged ? 230 : 170, this.isEnlarged ? 300 : 230); + childTrans.setContentSize(this.isEnlarged ? 230 : 170, this.isEnlarged ? 340 : 230); const widget = child.getComponent(Widget); if (widget) widget.updateAlignment(); } @@ -758,14 +758,14 @@ export class CardComp extends CCComp { if (this.NF_node) { const nfTrans = this.NF_node.getComponent(UITransform); if (nfTrans) { - nfTrans.setContentSize(this.isEnlarged ? 230 : 170, this.isEnlarged ? 300 : 230); + nfTrans.setContentSize(this.isEnlarged ? 230 : 170, this.isEnlarged ? 340 : 230); const widget = this.NF_node.getComponent(Widget); if (widget) widget.updateAlignment(); } this.NF_node.children.forEach(child => { const childTrans = child.getComponent(UITransform); if (childTrans) { - childTrans.setContentSize(this.isEnlarged ? 230 : 170, this.isEnlarged ? 300 : 230); + childTrans.setContentSize(this.isEnlarged ? 230 : 170, this.isEnlarged ? 340 : 230); const widget = child.getComponent(Widget); if (widget) widget.updateAlignment(); } @@ -776,7 +776,7 @@ export class CardComp extends CCComp { if (hbNode) { const hbTrans = hbNode.getComponent(UITransform); if (hbTrans) { - hbTrans.setContentSize(this.isEnlarged ? 230 : 170, this.isEnlarged ? 300 : 230); + hbTrans.setContentSize(this.isEnlarged ? 230 : 170, this.isEnlarged ? 340 : 230); const widget = hbNode.getComponent(Widget); if (widget) widget.updateAlignment(); } @@ -905,7 +905,7 @@ export class CardComp extends CCComp { if (this.isEnlarged) { if (this.restPosition.x <= -200) { targetX = this.restPosition.x + 30; - } else if (this.restPosition.x >= 200) { + } else if (this.restPosition.x >= 80) { targetX = this.restPosition.x - 30; } targetY = this.restPosition.y + 35; diff --git a/assets/script/game/map/MissionCardComp.ts b/assets/script/game/map/MissionCardComp.ts index 4f22fdb3..c1b18c6f 100644 --- a/assets/script/game/map/MissionCardComp.ts +++ b/assets/script/game/map/MissionCardComp.ts @@ -520,7 +520,10 @@ export class MissionCardComp extends CCComp { /** 将四个卡槽节点映射为 CardComp,形成固定顺序控制数组 */ private cacheCardComps() { - const nodes = [this.card1, this.card2, this.card3, this.card4]; + if (this.card4) { + this.card4.active = false; + } + const nodes = [this.card1, this.card2, this.card3]; this.cardComps = nodes .map(node => node?.getComponent(CardComp)) .filter((comp): comp is CardComp => !!comp); @@ -641,7 +644,7 @@ export class MissionCardComp extends CCComp { }); } - /** 构建本次抽卡结果,保证最终可分发4条数据 */ + /** 构建本次抽卡结果,保证最终可分发3条数据 */ private buildDrawCards(): CardConfig[] { let targetType: CardType | CardType[] | undefined = undefined; if (this.isBattlePhase) { @@ -651,11 +654,11 @@ export class MissionCardComp extends CCComp { } const cards = getCardsByLv(this.poolLv, targetType); - /** 正常情况下直接取前4 */ - if (cards.length >= 4) return cards.slice(0, 4); - /** 兜底:当返回不足4张时循环补齐,保证分发不缺位 */ + /** 正常情况下直接取前3 */ + if (cards.length >= 3) return cards.slice(0, 3); + /** 兜底:当返回不足3张时循环补齐,保证分发不缺位 */ const filled = [...cards]; - while (filled.length < 4) { + while (filled.length < 3) { const fallback = getCardsByLv(this.poolLv, targetType); if (fallback.length === 0) break; filled.push(fallback[filled.length % fallback.length]); @@ -665,14 +668,14 @@ export class MissionCardComp extends CCComp { private tryRefreshHeroCards(heroType?: HType, targetPoolLv?: number): boolean { const cards = drawCardsByRule(this.poolLv, { - count: 4, + count: 3, type: CardType.Hero, heroType, targetPoolLv }); if (cards.length <= 0) return false; this.layoutCardSlots(); - this.dispatchCardsToSlots(cards.slice(0, 4)); + this.dispatchCardsToSlots(cards.slice(0, 3)); return true; } @@ -708,15 +711,12 @@ export class MissionCardComp extends CCComp { private layoutCardSlots() { const count = this.cardComps.length; if (count === 0) return; - const startX = -((count - 1) * this.cardWidth) / 2; for (let i = 0; i < count; i++) { - const x = startX + i * this.cardWidth; - this.cardComps[i].setSlotPosition(x); + this.cardComps[i].setSlotPosition(this.cardsPos[i]); } mLogger.log(this.debugMode, "MissionCardComp", "layout card slots", { count, - cardWidth: this.cardWidth, - startX + cardWidth: this.cardWidth }); }