diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index 33bc2573..74b2b298 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -25,26 +25,26 @@ "__id__": 67 }, { - "__id__": 463 + "__id__": 465 }, { - "__id__": 491 + "__id__": 493 } ], "_active": true, "_components": [ - { - "__id__": 537 - }, { "__id__": 539 }, { "__id__": 541 + }, + { + "__id__": 543 } ], "_prefab": { - "__id__": 543 + "__id__": 545 }, "_lpos": { "__type__": "cc.Vec3", @@ -1542,26 +1542,23 @@ "__id__": 328 }, { - "__id__": 348 + "__id__": 350 }, { - "__id__": 371 + "__id__": 373 }, { - "__id__": 396 + "__id__": 398 }, { - "__id__": 408 + "__id__": 410 }, { - "__id__": 431 + "__id__": 433 } ], "_active": true, "_components": [ - { - "__id__": 454 - }, { "__id__": 456 }, @@ -1570,10 +1567,13 @@ }, { "__id__": 460 + }, + { + "__id__": 462 } ], "_prefab": { - "__id__": 462 + "__id__": 464 }, "_lpos": { "__type__": "cc.Vec3", @@ -7100,15 +7100,18 @@ }, { "__id__": 345 + }, + { + "__id__": 347 } ], "_prefab": { - "__id__": 347 + "__id__": 349 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 714.963, + "y": 940, "z": 0 }, "_lrot": { @@ -7161,7 +7164,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 10.047999999999998, + "y": 27.298, "z": 0 }, "_lrot": { @@ -7356,7 +7359,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -22.907, + "y": -7.045, "z": 0 }, "_lrot": { @@ -7506,7 +7509,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 262, - "height": 69 + "height": 103.5 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -7547,7 +7550,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -7567,6 +7570,42 @@ "__type__": "cc.CompPrefabInfo", "fileId": "11aHPCk1hI35Fcxhz5gq9+" }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 328 + }, + "_enabled": true, + "__prefab": { + "__id__": 348 + }, + "_alignFlags": 18, + "_target": null, + "_left": 180.8, + "_right": 180.8, + "_top": 460.8, + "_bottom": 450, + "_horizontalCenter": 0, + "_verticalCenter": 300, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 256, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "29rpxmsLBJEL0deKxv9IpR" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -7590,26 +7629,26 @@ }, "_children": [ { - "__id__": 349 + "__id__": 351 }, { - "__id__": 357 + "__id__": 359 } ], "_active": true, "_components": [ - { - "__id__": 363 - }, { "__id__": 365 }, { - "__id__": 368 + "__id__": 367 + }, + { + "__id__": 370 } ], "_prefab": { - "__id__": 370 + "__id__": 372 }, "_lpos": { "__type__": "cc.Vec3", @@ -7646,23 +7685,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 348 + "__id__": 350 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 350 - }, { "__id__": 352 }, { "__id__": 354 + }, + { + "__id__": 356 } ], "_prefab": { - "__id__": 356 + "__id__": 358 }, "_lpos": { "__type__": "cc.Vec3", @@ -7699,11 +7738,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 349 + "__id__": 351 }, "_enabled": true, "__prefab": { - "__id__": 351 + "__id__": 353 }, "_contentSize": { "__type__": "cc.Size", @@ -7727,11 +7766,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 349 + "__id__": 351 }, "_enabled": true, "__prefab": { - "__id__": 353 + "__id__": 355 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7775,11 +7814,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 349 + "__id__": 351 }, "_enabled": true, "__prefab": { - "__id__": 355 + "__id__": 357 }, "_alignFlags": 45, "_target": null, @@ -7824,20 +7863,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 348 + "__id__": 350 }, "_children": [], "_active": true, "_components": [ { - "__id__": 358 + "__id__": 360 }, { - "__id__": 360 + "__id__": 362 } ], "_prefab": { - "__id__": 362 + "__id__": 364 }, "_lpos": { "__type__": "cc.Vec3", @@ -7874,11 +7913,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 357 + "__id__": 359 }, "_enabled": true, "__prefab": { - "__id__": 359 + "__id__": 361 }, "_contentSize": { "__type__": "cc.Size", @@ -7902,11 +7941,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 357 + "__id__": 359 }, "_enabled": true, "__prefab": { - "__id__": 361 + "__id__": 363 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7983,11 +8022,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 348 + "__id__": 350 }, "_enabled": true, "__prefab": { - "__id__": 364 + "__id__": 366 }, "_contentSize": { "__type__": "cc.Size", @@ -8011,15 +8050,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 348 + "__id__": 350 }, "_enabled": true, "__prefab": { - "__id__": 366 + "__id__": 368 }, "clickEvents": [ { - "__id__": 367 + "__id__": 369 } ], "_interactable": true, @@ -8059,7 +8098,7 @@ "_duration": 0.1, "_zoomScale": 0.8, "_target": { - "__id__": 348 + "__id__": 350 }, "_id": "" }, @@ -8083,11 +8122,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 348 + "__id__": 350 }, "_enabled": true, "__prefab": { - "__id__": 369 + "__id__": 371 }, "_alignFlags": 4, "_target": null, @@ -8136,29 +8175,29 @@ }, "_children": [ { - "__id__": 372 + "__id__": 374 }, { - "__id__": 380 + "__id__": 382 } ], "_active": true, "_components": [ - { - "__id__": 386 - }, { "__id__": 388 }, { - "__id__": 391 + "__id__": 390 }, { "__id__": 393 + }, + { + "__id__": 395 } ], "_prefab": { - "__id__": 395 + "__id__": 397 }, "_lpos": { "__type__": "cc.Vec3", @@ -8195,23 +8234,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 371 + "__id__": 373 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 373 - }, { "__id__": 375 }, { "__id__": 377 + }, + { + "__id__": 379 } ], "_prefab": { - "__id__": 379 + "__id__": 381 }, "_lpos": { "__type__": "cc.Vec3", @@ -8248,11 +8287,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 372 + "__id__": 374 }, "_enabled": true, "__prefab": { - "__id__": 374 + "__id__": 376 }, "_contentSize": { "__type__": "cc.Size", @@ -8276,11 +8315,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 372 + "__id__": 374 }, "_enabled": true, "__prefab": { - "__id__": 376 + "__id__": 378 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8324,11 +8363,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 372 + "__id__": 374 }, "_enabled": true, "__prefab": { - "__id__": 378 + "__id__": 380 }, "_alignFlags": 45, "_target": null, @@ -8373,20 +8412,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 371 + "__id__": 373 }, "_children": [], "_active": true, "_components": [ { - "__id__": 381 + "__id__": 383 }, { - "__id__": 383 + "__id__": 385 } ], "_prefab": { - "__id__": 385 + "__id__": 387 }, "_lpos": { "__type__": "cc.Vec3", @@ -8423,11 +8462,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 380 + "__id__": 382 }, "_enabled": true, "__prefab": { - "__id__": 382 + "__id__": 384 }, "_contentSize": { "__type__": "cc.Size", @@ -8451,11 +8490,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 380 + "__id__": 382 }, "_enabled": true, "__prefab": { - "__id__": 384 + "__id__": 386 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8532,11 +8571,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 371 + "__id__": 373 }, "_enabled": true, "__prefab": { - "__id__": 387 + "__id__": 389 }, "_contentSize": { "__type__": "cc.Size", @@ -8560,15 +8599,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 371 + "__id__": 373 }, "_enabled": true, "__prefab": { - "__id__": 389 + "__id__": 391 }, "clickEvents": [ { - "__id__": 390 + "__id__": 392 } ], "_interactable": true, @@ -8608,7 +8647,7 @@ "_duration": 0.3, "_zoomScale": 1.3, "_target": { - "__id__": 371 + "__id__": 373 }, "_id": "" }, @@ -8632,11 +8671,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 371 + "__id__": 373 }, "_enabled": true, "__prefab": { - "__id__": 392 + "__id__": 394 }, "_alignFlags": 4, "_target": null, @@ -8668,11 +8707,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 371 + "__id__": 373 }, "_enabled": true, "__prefab": { - "__id__": 394 + "__id__": 396 }, "_id": "" }, @@ -8703,20 +8742,20 @@ }, "_children": [ { - "__id__": 397 + "__id__": 399 } ], "_active": true, "_components": [ { - "__id__": 403 + "__id__": 405 }, { - "__id__": 405 + "__id__": 407 } ], "_prefab": { - "__id__": 407 + "__id__": 409 }, "_lpos": { "__type__": "cc.Vec3", @@ -8753,20 +8792,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 396 + "__id__": 398 }, "_children": [], "_active": true, "_components": [ { - "__id__": 398 + "__id__": 400 }, { - "__id__": 400 + "__id__": 402 } ], "_prefab": { - "__id__": 402 + "__id__": 404 }, "_lpos": { "__type__": "cc.Vec3", @@ -8803,11 +8842,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 397 + "__id__": 399 }, "_enabled": true, "__prefab": { - "__id__": 399 + "__id__": 401 }, "_contentSize": { "__type__": "cc.Size", @@ -8831,11 +8870,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 397 + "__id__": 399 }, "_enabled": true, "__prefab": { - "__id__": 401 + "__id__": 403 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8889,11 +8928,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 396 + "__id__": 398 }, "_enabled": true, "__prefab": { - "__id__": 404 + "__id__": 406 }, "_contentSize": { "__type__": "cc.Size", @@ -8917,11 +8956,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 396 + "__id__": 398 }, "_enabled": true, "__prefab": { - "__id__": 406 + "__id__": 408 }, "playOnLoad": true, "_clips": [ @@ -8963,23 +9002,23 @@ }, "_children": [ { - "__id__": 409 + "__id__": 411 } ], "_active": true, "_components": [ - { - "__id__": 423 - }, { "__id__": 425 }, { - "__id__": 428 + "__id__": 427 + }, + { + "__id__": 430 } ], "_prefab": { - "__id__": 430 + "__id__": 432 }, "_lpos": { "__type__": "cc.Vec3", @@ -9016,27 +9055,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 408 + "__id__": 410 }, "_children": [ { - "__id__": 410 + "__id__": 412 } ], "_active": true, "_components": [ - { - "__id__": 416 - }, { "__id__": 418 }, { "__id__": 420 + }, + { + "__id__": 422 } ], "_prefab": { - "__id__": 422 + "__id__": 424 }, "_lpos": { "__type__": "cc.Vec3", @@ -9073,20 +9112,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 409 + "__id__": 411 }, "_children": [], "_active": true, "_components": [ { - "__id__": 411 + "__id__": 413 }, { - "__id__": 413 + "__id__": 415 } ], "_prefab": { - "__id__": 415 + "__id__": 417 }, "_lpos": { "__type__": "cc.Vec3", @@ -9123,11 +9162,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 410 + "__id__": 412 }, "_enabled": true, "__prefab": { - "__id__": 412 + "__id__": 414 }, "_contentSize": { "__type__": "cc.Size", @@ -9151,11 +9190,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 410 + "__id__": 412 }, "_enabled": true, "__prefab": { - "__id__": 414 + "__id__": 416 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9212,11 +9251,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 409 + "__id__": 411 }, "_enabled": true, "__prefab": { - "__id__": 417 + "__id__": 419 }, "_contentSize": { "__type__": "cc.Size", @@ -9240,11 +9279,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 409 + "__id__": 411 }, "_enabled": true, "__prefab": { - "__id__": 419 + "__id__": 421 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9288,11 +9327,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 409 + "__id__": 411 }, "_enabled": true, "__prefab": { - "__id__": 421 + "__id__": 423 }, "_alignFlags": 45, "_target": null, @@ -9337,11 +9376,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 408 + "__id__": 410 }, "_enabled": true, "__prefab": { - "__id__": 424 + "__id__": 426 }, "_contentSize": { "__type__": "cc.Size", @@ -9365,15 +9404,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 408 + "__id__": 410 }, "_enabled": true, "__prefab": { - "__id__": 426 + "__id__": 428 }, "clickEvents": [ { - "__id__": 427 + "__id__": 429 } ], "_interactable": true, @@ -9413,7 +9452,7 @@ "_duration": 0.1, "_zoomScale": 0.8, "_target": { - "__id__": 408 + "__id__": 410 }, "_id": "" }, @@ -9437,11 +9476,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 408 + "__id__": 410 }, "_enabled": true, "__prefab": { - "__id__": 429 + "__id__": 431 }, "_alignFlags": 4, "_target": null, @@ -9490,23 +9529,23 @@ }, "_children": [ { - "__id__": 432 + "__id__": 434 } ], "_active": true, "_components": [ - { - "__id__": 446 - }, { "__id__": 448 }, { - "__id__": 451 + "__id__": 450 + }, + { + "__id__": 453 } ], "_prefab": { - "__id__": 453 + "__id__": 455 }, "_lpos": { "__type__": "cc.Vec3", @@ -9543,27 +9582,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 431 + "__id__": 433 }, "_children": [ { - "__id__": 433 + "__id__": 435 } ], "_active": true, "_components": [ - { - "__id__": 439 - }, { "__id__": 441 }, { "__id__": 443 + }, + { + "__id__": 445 } ], "_prefab": { - "__id__": 445 + "__id__": 447 }, "_lpos": { "__type__": "cc.Vec3", @@ -9600,20 +9639,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 432 + "__id__": 434 }, "_children": [], "_active": true, "_components": [ { - "__id__": 434 + "__id__": 436 }, { - "__id__": 436 + "__id__": 438 } ], "_prefab": { - "__id__": 438 + "__id__": 440 }, "_lpos": { "__type__": "cc.Vec3", @@ -9650,11 +9689,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 433 + "__id__": 435 }, "_enabled": true, "__prefab": { - "__id__": 435 + "__id__": 437 }, "_contentSize": { "__type__": "cc.Size", @@ -9678,11 +9717,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 433 + "__id__": 435 }, "_enabled": true, "__prefab": { - "__id__": 437 + "__id__": 439 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9739,11 +9778,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 432 + "__id__": 434 }, "_enabled": true, "__prefab": { - "__id__": 440 + "__id__": 442 }, "_contentSize": { "__type__": "cc.Size", @@ -9767,11 +9806,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 432 + "__id__": 434 }, "_enabled": true, "__prefab": { - "__id__": 442 + "__id__": 444 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9815,11 +9854,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 432 + "__id__": 434 }, "_enabled": true, "__prefab": { - "__id__": 444 + "__id__": 446 }, "_alignFlags": 45, "_target": null, @@ -9864,11 +9903,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 431 + "__id__": 433 }, "_enabled": true, "__prefab": { - "__id__": 447 + "__id__": 449 }, "_contentSize": { "__type__": "cc.Size", @@ -9892,15 +9931,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 431 + "__id__": 433 }, "_enabled": true, "__prefab": { - "__id__": 449 + "__id__": 451 }, "clickEvents": [ { - "__id__": 450 + "__id__": 452 } ], "_interactable": true, @@ -9940,7 +9979,7 @@ "_duration": 0.1, "_zoomScale": 0.8, "_target": { - "__id__": 431 + "__id__": 433 }, "_id": "" }, @@ -9964,11 +10003,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 431 + "__id__": 433 }, "_enabled": true, "__prefab": { - "__id__": 452 + "__id__": 454 }, "_alignFlags": 4, "_target": null, @@ -10017,7 +10056,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 455 + "__id__": 457 }, "_contentSize": { "__type__": "cc.Size", @@ -10045,7 +10084,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 457 + "__id__": 459 }, "_alignFlags": 21, "_target": null, @@ -10081,7 +10120,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 459 + "__id__": 461 }, "_id": "" }, @@ -10099,7 +10138,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 461 + "__id__": 463 }, "_id": "" }, @@ -10130,26 +10169,26 @@ }, "_children": [ { - "__id__": 464 + "__id__": 466 }, { - "__id__": 472 + "__id__": 474 } ], "_active": false, "_components": [ - { - "__id__": 484 - }, { "__id__": 486 }, { "__id__": 488 + }, + { + "__id__": 490 } ], "_prefab": { - "__id__": 490 + "__id__": 492 }, "_lpos": { "__type__": "cc.Vec3", @@ -10186,23 +10225,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 463 + "__id__": 465 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 465 - }, { "__id__": 467 }, { "__id__": 469 + }, + { + "__id__": 471 } ], "_prefab": { - "__id__": 471 + "__id__": 473 }, "_lpos": { "__type__": "cc.Vec3", @@ -10239,11 +10278,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 464 + "__id__": 466 }, "_enabled": true, "__prefab": { - "__id__": 466 + "__id__": 468 }, "_contentSize": { "__type__": "cc.Size", @@ -10267,11 +10306,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 464 + "__id__": 466 }, "_enabled": true, "__prefab": { - "__id__": 468 + "__id__": 470 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10315,11 +10354,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 464 + "__id__": 466 }, "_enabled": true, "__prefab": { - "__id__": 470 + "__id__": 472 }, "_alignFlags": 45, "_target": null, @@ -10362,17 +10401,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 463 + "__id__": 465 }, "_prefab": { - "__id__": 473 + "__id__": 475 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 472 + "__id__": 474 }, "asset": { "__uuid__": "9cc71d8c-192a-4234-8204-352f42b95c65", @@ -10380,7 +10419,7 @@ }, "fileId": "a0daVw8DRLi6ToMaTA0VS2", "instance": { - "__id__": 474 + "__id__": 476 }, "targetOverrides": null }, @@ -10393,23 +10432,23 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 475 - }, { "__id__": 477 }, - { - "__id__": 478 - }, { "__id__": 479 }, { "__id__": 480 }, + { + "__id__": 481 + }, { "__id__": 482 + }, + { + "__id__": 484 } ], "removedComponents": [] @@ -10417,7 +10456,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 476 + "__id__": 478 }, "propertyPath": [ "_name" @@ -10433,7 +10472,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 476 + "__id__": 478 }, "propertyPath": [ "_lpos" @@ -10448,7 +10487,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 476 + "__id__": 478 }, "propertyPath": [ "_lrot" @@ -10464,7 +10503,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 476 + "__id__": 478 }, "propertyPath": [ "_euler" @@ -10479,7 +10518,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 481 + "__id__": 483 }, "propertyPath": [ "_contentSize" @@ -10499,7 +10538,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 483 + "__id__": 485 }, "propertyPath": [ "_contentSize" @@ -10522,11 +10561,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 463 + "__id__": 465 }, "_enabled": true, "__prefab": { - "__id__": 485 + "__id__": 487 }, "_contentSize": { "__type__": "cc.Size", @@ -10550,11 +10589,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 463 + "__id__": 465 }, "_enabled": true, "__prefab": { - "__id__": 487 + "__id__": 489 }, "_alignFlags": 45, "_target": null, @@ -10586,11 +10625,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 463 + "__id__": 465 }, "_enabled": true, "__prefab": { - "__id__": 489 + "__id__": 491 }, "_id": "" }, @@ -10621,23 +10660,23 @@ }, "_children": [ { - "__id__": 492 + "__id__": 494 } ], "_active": true, "_components": [ - { - "__id__": 530 - }, { "__id__": 532 }, { "__id__": 534 + }, + { + "__id__": 536 } ], "_prefab": { - "__id__": 536 + "__id__": 538 }, "_lpos": { "__type__": "cc.Vec3", @@ -10674,18 +10713,15 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 491 + "__id__": 493 }, "_children": [ { - "__id__": 493 + "__id__": 495 } ], "_active": true, "_components": [ - { - "__id__": 521 - }, { "__id__": 523 }, @@ -10694,10 +10730,13 @@ }, { "__id__": 527 + }, + { + "__id__": 529 } ], "_prefab": { - "__id__": 529 + "__id__": 531 }, "_lpos": { "__type__": "cc.Vec3", @@ -10734,27 +10773,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 492 + "__id__": 494 }, "_children": [ { - "__id__": 494 + "__id__": 496 }, { - "__id__": 502 + "__id__": 504 }, { - "__id__": 508 + "__id__": 510 } ], "_active": true, "_components": [ { - "__id__": 518 + "__id__": 520 } ], "_prefab": { - "__id__": 520 + "__id__": 522 }, "_lpos": { "__type__": "cc.Vec3", @@ -10791,23 +10830,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 493 + "__id__": 495 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 495 - }, { "__id__": 497 }, { "__id__": 499 + }, + { + "__id__": 501 } ], "_prefab": { - "__id__": 501 + "__id__": 503 }, "_lpos": { "__type__": "cc.Vec3", @@ -10844,11 +10883,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 494 + "__id__": 496 }, "_enabled": true, "__prefab": { - "__id__": 496 + "__id__": 498 }, "_contentSize": { "__type__": "cc.Size", @@ -10872,11 +10911,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 494 + "__id__": 496 }, "_enabled": true, "__prefab": { - "__id__": 498 + "__id__": 500 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10920,11 +10959,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 494 + "__id__": 496 }, "_enabled": true, "__prefab": { - "__id__": 500 + "__id__": 502 }, "_alignFlags": 40, "_target": null, @@ -10969,20 +11008,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 493 + "__id__": 495 }, "_children": [], "_active": true, "_components": [ { - "__id__": 503 + "__id__": 505 }, { - "__id__": 505 + "__id__": 507 } ], "_prefab": { - "__id__": 507 + "__id__": 509 }, "_lpos": { "__type__": "cc.Vec3", @@ -11019,11 +11058,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 502 + "__id__": 504 }, "_enabled": true, "__prefab": { - "__id__": 504 + "__id__": 506 }, "_contentSize": { "__type__": "cc.Size", @@ -11047,11 +11086,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 502 + "__id__": 504 }, "_enabled": true, "__prefab": { - "__id__": 506 + "__id__": 508 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11108,14 +11147,11 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 493 + "__id__": 495 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 509 - }, { "__id__": 511 }, @@ -11124,10 +11160,13 @@ }, { "__id__": 515 + }, + { + "__id__": 517 } ], "_prefab": { - "__id__": 517 + "__id__": 519 }, "_lpos": { "__type__": "cc.Vec3", @@ -11164,11 +11203,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 508 + "__id__": 510 }, "_enabled": true, "__prefab": { - "__id__": 510 + "__id__": 512 }, "_contentSize": { "__type__": "cc.Size", @@ -11192,11 +11231,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 508 + "__id__": 510 }, "_enabled": true, "__prefab": { - "__id__": 512 + "__id__": 514 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11260,11 +11299,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 508 + "__id__": 510 }, "_enabled": true, "__prefab": { - "__id__": 514 + "__id__": 516 }, "_alignFlags": 10, "_target": null, @@ -11296,11 +11335,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 508 + "__id__": 510 }, "_enabled": true, "__prefab": { - "__id__": 516 + "__id__": 518 }, "templateMode": true, "watchPath": "data.data.gold", @@ -11333,11 +11372,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 493 + "__id__": 495 }, "_enabled": true, "__prefab": { - "__id__": 519 + "__id__": 521 }, "_contentSize": { "__type__": "cc.Size", @@ -11374,11 +11413,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 492 + "__id__": 494 }, "_enabled": true, "__prefab": { - "__id__": 522 + "__id__": 524 }, "_contentSize": { "__type__": "cc.Size", @@ -11402,11 +11441,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 492 + "__id__": 494 }, "_enabled": true, "__prefab": { - "__id__": 524 + "__id__": 526 }, "_alignFlags": 8, "_target": null, @@ -11438,11 +11477,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 492 + "__id__": 494 }, "_enabled": true, "__prefab": { - "__id__": 526 + "__id__": 528 }, "_resizeMode": 0, "_layoutType": 1, @@ -11476,11 +11515,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 492 + "__id__": 494 }, "_enabled": true, "__prefab": { - "__id__": 528 + "__id__": 530 }, "_alignFlags": 40, "_target": null, @@ -11525,11 +11564,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 491 + "__id__": 493 }, "_enabled": true, "__prefab": { - "__id__": 531 + "__id__": 533 }, "_contentSize": { "__type__": "cc.Size", @@ -11553,11 +11592,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 491 + "__id__": 493 }, "_enabled": true, "__prefab": { - "__id__": 533 + "__id__": 535 }, "_alignFlags": 17, "_target": null, @@ -11589,11 +11628,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 491 + "__id__": 493 }, "_enabled": true, "__prefab": { - "__id__": 535 + "__id__": 537 }, "_id": "" }, @@ -11624,7 +11663,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 538 + "__id__": 540 }, "_contentSize": { "__type__": "cc.Size", @@ -11652,7 +11691,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 540 + "__id__": 542 }, "_alignFlags": 45, "_target": null, @@ -11688,7 +11727,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 542 + "__id__": 544 }, "_id": "" }, @@ -11709,7 +11748,7 @@ "targetOverrides": [], "nestedPrefabInstanceRoots": [ { - "__id__": 472 + "__id__": 474 }, { "__id__": 277 diff --git a/assets/script/game/map/HInfoComp.ts b/assets/script/game/map/HInfoComp.ts index f8de0b33..12a83034 100644 --- a/assets/script/game/map/HInfoComp.ts +++ b/assets/script/game/map/HInfoComp.ts @@ -25,13 +25,13 @@ export class HInfoComp extends CCComp { // 英雄位置定义 hero_pos:any={ - 0:v3(420,-30,0), // 不在屏幕内 - 1:v3(280,-30,0), + 0:v3(500,-30,0), // 不在屏幕内 + 1:v3(320,-30,0), 2:v3(160,-30,0), - 3:v3(0,-40,0), + 3:v3(0,-30,0), 4:v3(-160,-30,0), - 5:v3(-280,-30,0), - 6:v3(-420,-30,0), // 不在屏幕内 + 5:v3(-320,-30,0), + 6:v3(-500,-30,0), // 不在屏幕内 } // 动画锁定标志:防止快速点击导致的动画冲突 @@ -55,9 +55,9 @@ export class HInfoComp extends CCComp { case 4: return v3(-1.5, 1.5, 1); // 2、4位置:1.5倍缩放 case 3: - return v3(-1.8, 1.8, 1); // 3位置(中心):1.5倍缩放 + return v3(-1.5, 1.5, 1); // 3位置(中心):1.5倍缩放 default: - return v3(-1.5, 1.5, 1); // 其他位置:1.5倍缩放 + return v3(-1.5, 1.5, 1); // 其他位置:1.8倍缩放 } }