From 69ec6c93fcafb0d88e9860151b405bae32330d6b Mon Sep 17 00:00:00 2001 From: "pan@work" Date: Mon, 2 Dec 2024 11:03:15 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=A7=E7=BB=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/resources/game/heros/k1.prefab | 2 +- assets/resources/gui/element/hero_card.prefab | 20 +- assets/resources/gui/gui.plist.meta | 24 +- assets/resources/gui/role_controller.prefab | 2582 ++++++----------- assets/script/game/map/CardController.ts | 12 +- 5 files changed, 870 insertions(+), 1770 deletions(-) diff --git a/assets/resources/game/heros/k1.prefab b/assets/resources/game/heros/k1.prefab index 09789ace..3e5a0fb6 100644 --- a/assets/resources/game/heros/k1.prefab +++ b/assets/resources/game/heros/k1.prefab @@ -641,7 +641,7 @@ "defaultSkin": "default", "defaultAnimation": "Idle", "_premultipliedAlpha": true, - "_timeScale": 0.8, + "_timeScale": 0.9, "_preCacheMode": 0, "_cacheMode": 0, "_sockets": [], diff --git a/assets/resources/gui/element/hero_card.prefab b/assets/resources/gui/element/hero_card.prefab index 1a415d88..7eccb608 100644 --- a/assets/resources/gui/element/hero_card.prefab +++ b/assets/resources/gui/element/hero_card.prefab @@ -61,8 +61,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.7, - "y": 0.7, + "x": 1, + "y": 1, "z": 1 }, "_mobility": 0, @@ -170,9 +170,9 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 205, - "g": 255, - "b": 192, + "r": 29, + "g": 180, + "b": 252, "a": 255 }, "_spriteFrame": { @@ -291,8 +291,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -5.679, - "y": -18.007, + "x": -1.181, + "y": -14.558, "z": 0 }, "_lrot": { @@ -418,7 +418,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 112, + "width": 128, "height": 120 }, "_anchorPoint": { @@ -541,7 +541,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": -45.98, - "y": -36.286, + "y": 61.153, "z": 0 }, "_lrot": { @@ -1008,7 +1008,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 65.19, + "y": -29.78, "z": 0 }, "_lrot": { diff --git a/assets/resources/gui/gui.plist.meta b/assets/resources/gui/gui.plist.meta index e6a38c65..2abfca47 100644 --- a/assets/resources/gui/gui.plist.meta +++ b/assets/resources/gui/gui.plist.meta @@ -1635,10 +1635,10 @@ "height": 107, "rawWidth": 128, "rawHeight": 107, - "borderTop": 40, - "borderBottom": 41, - "borderLeft": 30, - "borderRight": 28, + "borderTop": 50, + "borderBottom": 48, + "borderLeft": 52, + "borderRight": 52, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, @@ -3797,10 +3797,10 @@ "height": 62, "rawWidth": 60, "rawHeight": 62, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, + "borderTop": 22, + "borderBottom": 23, + "borderLeft": 24, + "borderRight": 23, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, @@ -8029,10 +8029,10 @@ "height": 56, "rawWidth": 36, "rawHeight": 56, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, + "borderTop": 30, + "borderBottom": 20, + "borderLeft": 16, + "borderRight": 16, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index ebced724..96d83b2a 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -37,26 +37,26 @@ "__id__": 318 }, { - "__id__": 569 + "__id__": 512 }, { - "__id__": 658 + "__id__": 601 } ], "_active": true, "_components": [ { - "__id__": 664 + "__id__": 607 }, { - "__id__": 666 + "__id__": 609 }, { - "__id__": 668 + "__id__": 611 } ], "_prefab": { - "__id__": 670 + "__id__": 613 }, "_lpos": { "__type__": "cc.Vec3", @@ -1865,7 +1865,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 1211.843, + "x": -1216.052, "y": 690, "z": 0 }, @@ -5515,7 +5515,7 @@ "_right": 0, "_top": 0, "_bottom": 0, - "_horizontalCenter": 1211.843, + "_horizontalCenter": -1216.052, "_verticalCenter": 50, "_isAbsLeft": true, "_isAbsRight": true, @@ -6570,27 +6570,27 @@ "__id__": 319 }, { - "__id__": 345 + "__id__": 327 }, { - "__id__": 351 + "__id__": 345 } ], "_active": true, "_components": [ { - "__id__": 564 + "__id__": 507 }, { - "__id__": 566 + "__id__": 509 } ], "_prefab": { - "__id__": 568 + "__id__": 511 }, "_lpos": { "__type__": "cc.Vec3", - "x": -900, + "x": 0, "y": 0, "z": 0 }, @@ -6625,86 +6625,26 @@ "_parent": { "__id__": 318 }, - "_children": [ - { - "__id__": 320 - }, - { - "__id__": 326 - }, - { - "__id__": 332 - } - ], - "_active": true, - "_components": [ - { - "__id__": 338 - }, - { - "__id__": 340 - }, - { - "__id__": 342 - } - ], - "_prefab": { - "__id__": 344 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 971.747, - "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.Node", - "_name": "Background_Stage01_Bg", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 319 - }, "_children": [], "_active": true, "_components": [ { - "__id__": 321 + "__id__": 320 }, { - "__id__": 323 + "__id__": 322 + }, + { + "__id__": 324 } ], "_prefab": { - "__id__": 325 + "__id__": 326 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 21.198, + "y": 640, "z": 0 }, "_lrot": { @@ -6716,8 +6656,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 5, + "y": 5, "z": 1 }, "_mobility": 0, @@ -6736,16 +6676,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 320 + "__id__": 319 }, "_enabled": true, "__prefab": { - "__id__": 322 + "__id__": 321 }, "_contentSize": { "__type__": "cc.Size", - "width": 720, - "height": 1280 + "width": 144, + "height": 256 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -6756,7 +6696,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "59CgMhzXVFWaxKR6XiAAvJ" + "fileId": "bc16EQ239F3p8sjqSwq4hM" }, { "__type__": "cc.Sprite", @@ -6764,11 +6704,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 320 + "__id__": 319 }, "_enabled": true, "__prefab": { - "__id__": 324 + "__id__": 323 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6781,10 +6721,10 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@eb5f8", + "__uuid__": "8e53e122-d71b-440a-bb07-9938dd6c20d9@098d7", "__expectedType__": "cc.SpriteFrame" }, - "_type": 0, + "_type": 2, "_fillType": 0, "_sizeMode": 0, "_fillCenter": { @@ -6801,7 +6741,43 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "55gjhwrHJCUbgIz9/n7lKK" + "fileId": "399iu8nHlLMIKijzZL4S7w" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 319 + }, + "_enabled": true, + "__prefab": { + "__id__": 325 + }, + "_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": 200, + "_originalHeight": 400, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "6f3dVDvPBHwasMHHa1vPZs" }, { "__type__": "cc.PrefabInfo", @@ -6811,36 +6787,43 @@ "asset": { "__id__": 0 }, - "fileId": "6fbwazkUhLVpg8HNIszvYO", + "fileId": "b8XgV3uVFBgJBv2RkMO6wU", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "shadow", + "_name": "hero", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 319 + "__id__": 318 }, - "_children": [], + "_children": [ + { + "__id__": 328 + }, + { + "__id__": 334 + } + ], "_active": true, "_components": [ { - "__id__": 327 + "__id__": 340 }, { - "__id__": 329 + "__id__": 342 } ], "_prefab": { - "__id__": 331 + "__id__": 344 }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, - "y": -59.809, + "x": -260, + "y": 720, "z": 0 }, "_lrot": { @@ -6852,8 +6835,58 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 6, - "y": 4, + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "herobg", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 327 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 329 + }, + { + "__id__": 331 + } + ], + "_prefab": { + "__id__": 333 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -16.082, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1.2, + "y": 1, "z": 1 }, "_mobility": 0, @@ -6872,16 +6905,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 326 + "__id__": 328 }, "_enabled": true, "__prefab": { - "__id__": 328 + "__id__": 330 }, "_contentSize": { "__type__": "cc.Size", - "width": 32, - "height": 12 + "width": 128, + "height": 107 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -6892,7 +6925,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "72J97f7UlAmKlIlblHH8Cj" + "fileId": "341MOQgbNBdZQtYcr7KTc3" }, { "__type__": "cc.Sprite", @@ -6900,11 +6933,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 326 + "__id__": 328 }, "_enabled": true, "__prefab": { - "__id__": 330 + "__id__": 332 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6917,7 +6950,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@34d88", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@f37b3", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -6930,14 +6963,14 @@ }, "_fillStart": 0, "_fillRange": 0, - "_isTrimmedMode": true, + "_isTrimmedMode": false, "_useGrayscale": false, "_atlas": null, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "cb5U/jDcJHBbwwOxV77lBq" + "fileId": "2bL94P7hJIrakkTo62rRUW" }, { "__type__": "cc.PrefabInfo", @@ -6947,36 +6980,36 @@ "asset": { "__id__": 0 }, - "fileId": "645IL4ALtBIrBko403zRwT", + "fileId": "f2Rt+rsydN8biSNdt1Y+D4", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "k1", + "_name": "icon", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 319 + "__id__": 327 }, "_children": [], "_active": true, "_components": [ { - "__id__": 333 + "__id__": 335 }, { - "__id__": 335 + "__id__": 337 } ], "_prefab": { - "__id__": 337 + "__id__": 339 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 78.947, + "y": 55.199, "z": 0 }, "_lrot": { @@ -6988,8 +7021,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 2, - "y": 2, + "x": 1.5, + "y": 1.5, "z": 1 }, "_mobility": 0, @@ -7008,11 +7041,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 332 + "__id__": 334 }, "_enabled": true, "__prefab": { - "__id__": 334 + "__id__": 336 }, "_contentSize": { "__type__": "cc.Size", @@ -7036,11 +7069,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 332 + "__id__": 334 }, "_enabled": true, "__prefab": { - "__id__": 336 + "__id__": 338 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7094,16 +7127,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 319 + "__id__": 327 }, "_enabled": true, "__prefab": { - "__id__": 339 + "__id__": 341 }, "_contentSize": { "__type__": "cc.Size", - "width": 900, - "height": 2000 + "width": 100, + "height": 100 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -7114,52 +7147,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a1MMVo9LBBVL03De7CnLBW" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 319 - }, - "_enabled": true, - "__prefab": { - "__id__": 341 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@58cb7", - "__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": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "9aiGvTKF1Fx7jO5lLivZz7" + "fileId": "a6TTH2dytIyKxeNxzNh5UJ" }, { "__type__": "cc.Widget", @@ -7167,20 +7155,20 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 319 + "__id__": 327 }, "_enabled": true, "__prefab": { "__id__": 343 }, - "_alignFlags": 21, + "_alignFlags": 10, "_target": null, - "_left": 0, + "_left": 50, "_right": 0, - "_top": -691.7469999999998, - "_bottom": -28.253000000000043, + "_top": 0, + "_bottom": 0, "_horizontalCenter": 0, - "_verticalCenter": 0, + "_verticalCenter": 80, "_isAbsLeft": true, "_isAbsRight": true, "_isAbsTop": true, @@ -7188,14 +7176,14 @@ "_isAbsHorizontalCenter": true, "_isAbsVerticalCenter": true, "_originalWidth": 0, - "_originalHeight": 699.9, + "_originalHeight": 0, "_alignMode": 2, "_lockFlags": 0, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "74QJ7wA5tHRZTK+EjHrgMJ" + "fileId": "24GcVtcIFCQqYJjjXajoAF" }, { "__type__": "cc.PrefabInfo", @@ -7205,143 +7193,7 @@ "asset": { "__id__": 0 }, - "fileId": "02uinUCclHbYkwxQBZDymT", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "Background_Lobby_bg_bottom", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 318 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 346 - }, - { - "__id__": 348 - } - ], - "_prefab": { - "__id__": 350 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 411.084, - "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__": 345 - }, - "_enabled": true, - "__prefab": { - "__id__": 347 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 720, - "height": 900 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d3YfOOLf5JJLjFUmvfQutR" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 345 - }, - "_enabled": true, - "__prefab": { - "__id__": 349 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@e651a", - "__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": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23n4xv9JhPELwIAAwui+Va" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "5flAjCNBJHEJGEm0rhrPLo", + "fileId": "2fPdGDW9FHLbXtBj8Vv0F6", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -7356,37 +7208,37 @@ }, "_children": [ { - "__id__": 352 + "__id__": 346 }, { - "__id__": 358 + "__id__": 354 }, { - "__id__": 376 + "__id__": 372 } ], "_active": true, "_components": [ { - "__id__": 557 + "__id__": 500 }, { - "__id__": 559 + "__id__": 502 }, { - "__id__": 373 + "__id__": 369 }, { - "__id__": 561 + "__id__": 504 } ], "_prefab": { - "__id__": 563 + "__id__": 506 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 340, + "y": 205, "z": 0 }, "_lrot": { @@ -7418,25 +7270,28 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 351 + "__id__": 345 }, "_children": [], "_active": true, "_components": [ { - "__id__": 353 + "__id__": 347 }, { - "__id__": 355 + "__id__": 349 + }, + { + "__id__": 351 } ], "_prefab": { - "__id__": 357 + "__id__": 353 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -36.55, + "y": 0, "z": 0 }, "_lrot": { @@ -7468,16 +7323,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 352 + "__id__": 346 }, "_enabled": true, "__prefab": { - "__id__": 354 + "__id__": 348 }, "_contentSize": { "__type__": "cc.Size", - "width": 720, - "height": 600 + "width": 740, + "height": 200 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -7496,11 +7351,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 352 + "__id__": 346 }, "_enabled": true, "__prefab": { - "__id__": 356 + "__id__": 350 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7513,7 +7368,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@91e3c", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@cffd7", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -7535,6 +7390,42 @@ "__type__": "cc.CompPrefabInfo", "fileId": "269fspUsVH+5zdda2VBPje" }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 346 + }, + "_enabled": true, + "__prefab": { + "__id__": 352 + }, + "_alignFlags": 40, + "_target": null, + "_left": -10, + "_right": -10, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 720, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "bdZ1HDS4xBXZjtuHG/mLDb" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -7554,30 +7445,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 351 + "__id__": 345 }, "_children": [ { - "__id__": 359 + "__id__": 355 } ], "_active": false, "_components": [ + { + "__id__": 361 + }, + { + "__id__": 363 + }, { "__id__": 365 }, { "__id__": 367 - }, - { - "__id__": 369 - }, - { - "__id__": 371 } ], "_prefab": { - "__id__": 556 + "__id__": 499 }, "_lpos": { "__type__": "cc.Vec3", @@ -7614,20 +7505,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 358 + "__id__": 354 }, "_children": [], "_active": true, "_components": [ { - "__id__": 360 + "__id__": 356 }, { - "__id__": 362 + "__id__": 358 } ], "_prefab": { - "__id__": 364 + "__id__": 360 }, "_lpos": { "__type__": "cc.Vec3", @@ -7664,11 +7555,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 359 + "__id__": 355 }, "_enabled": true, "__prefab": { - "__id__": 361 + "__id__": 357 }, "_contentSize": { "__type__": "cc.Size", @@ -7692,11 +7583,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 359 + "__id__": 355 }, "_enabled": true, "__prefab": { - "__id__": 363 + "__id__": 359 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7750,11 +7641,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 358 + "__id__": 354 }, "_enabled": true, "__prefab": { - "__id__": 366 + "__id__": 362 }, "_contentSize": { "__type__": "cc.Size", @@ -7778,11 +7669,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 358 + "__id__": 354 }, "_enabled": true, "__prefab": { - "__id__": 368 + "__id__": 364 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7820,11 +7711,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 358 + "__id__": 354 }, "_enabled": true, "__prefab": { - "__id__": 370 + "__id__": 366 }, "_alignFlags": 37, "_target": null, @@ -7856,19 +7747,19 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 358 + "__id__": 354 }, "_enabled": true, "__prefab": { - "__id__": 372 + "__id__": 368 }, "_scrollView": { - "__id__": 373 + "__id__": 369 }, "_handle": { - "__id__": 362 + "__id__": 358 }, - "_direction": 1, + "_direction": 0, "_enableAutoHide": false, "_autoHideTime": 1, "_id": "" @@ -7883,26 +7774,26 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 351 + "__id__": 345 }, "_enabled": true, "__prefab": { - "__id__": 374 + "__id__": 370 }, "bounceDuration": 0.23, "brake": 0.75, "elastic": true, "inertia": true, - "horizontal": false, - "vertical": true, + "horizontal": true, + "vertical": false, "cancelInnerEvents": true, "scrollEvents": [], "_content": { - "__id__": 375 + "__id__": 371 }, "_horizontalScrollBar": null, "_verticalScrollBar": { - "__id__": 371 + "__id__": 367 }, "_id": "" }, @@ -7916,71 +7807,62 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 376 + "__id__": 372 }, "_children": [ { - "__id__": 386 + "__id__": 382 }, { - "__id__": 397 + "__id__": 392 }, { - "__id__": 408 + "__id__": 402 }, { - "__id__": 419 + "__id__": 412 }, { - "__id__": 430 + "__id__": 422 }, { - "__id__": 441 + "__id__": 432 + }, + { + "__id__": 442 }, { "__id__": 452 }, { - "__id__": 463 + "__id__": 462 }, { - "__id__": 474 + "__id__": 472 }, { - "__id__": 485 - }, - { - "__id__": 496 - }, - { - "__id__": 507 - }, - { - "__id__": 518 - }, - { - "__id__": 529 - }, - { - "__id__": 540 + "__id__": 482 } ], "_active": true, "_components": [ { - "__id__": 551 + "__id__": 492 }, { - "__id__": 553 + "__id__": 494 + }, + { + "__id__": 496 } ], "_prefab": { - "__id__": 555 + "__id__": 498 }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, - "y": 232.253, + "x": -360, + "y": 0, "z": 0 }, "_lrot": { @@ -8012,30 +7894,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 351 + "__id__": 345 }, "_children": [ { - "__id__": 375 + "__id__": 371 } ], "_active": true, "_components": [ + { + "__id__": 373 + }, + { + "__id__": 375 + }, { "__id__": 377 }, { "__id__": 379 - }, - { - "__id__": 381 - }, - { - "__id__": 383 } ], "_prefab": { - "__id__": 385 + "__id__": 381 }, "_lpos": { "__type__": "cc.Vec3", @@ -8072,16 +7954,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 376 + "__id__": 372 }, "_enabled": true, "__prefab": { - "__id__": 378 + "__id__": 374 }, "_contentSize": { "__type__": "cc.Size", "width": 720, - "height": 500 + "height": 200 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -8100,11 +7982,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 376 + "__id__": 372 }, "_enabled": true, "__prefab": { - "__id__": 380 + "__id__": 376 }, "_type": 0, "_inverted": false, @@ -8122,11 +8004,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 376 + "__id__": 372 }, "_enabled": true, "__prefab": { - "__id__": 382 + "__id__": 378 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8168,18 +8050,18 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 376 + "__id__": 372 }, "_enabled": true, "__prefab": { - "__id__": 384 + "__id__": 380 }, "_alignFlags": 45, "_target": null, "_left": 0, "_right": 0, - "_top": 0, - "_bottom": 0, + "_top": -35, + "_bottom": -35, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -8215,17 +8097,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 375 + "__id__": 371 }, "_prefab": { - "__id__": 387 + "__id__": 383 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 386 + "__id__": 382 }, "asset": { "__uuid__": "79e41d70-e29c-4986-98a4-349aa253f58e", @@ -8233,36 +8115,33 @@ }, "fileId": "9eIoeBQ/FAuKISfw/S9q2E", "instance": { - "__id__": 388 + "__id__": 384 }, "targetOverrides": null }, { "__type__": "cc.PrefabInstance", - "fileId": "a8BfvJcfhCGLnxKq2tDjEX", + "fileId": "0bY2/gEW9LEJLHiCqtbLI+", "prefabRootNode": { "__id__": 1 }, "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ + { + "__id__": 385 + }, + { + "__id__": 387 + }, + { + "__id__": 388 + }, { "__id__": 389 }, { - "__id__": 391 - }, - { - "__id__": 392 - }, - { - "__id__": 393 - }, - { - "__id__": 394 - }, - { - "__id__": 395 + "__id__": 390 } ], "removedComponents": [] @@ -8270,7 +8149,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 390 + "__id__": 386 }, "propertyPath": [ "_name" @@ -8286,22 +8165,22 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 390 + "__id__": 386 }, "propertyPath": [ "_lpos" ], "value": { "__type__": "cc.Vec3", - "x": -280, - "y": -90, + "x": 80, + "y": -10, "z": 0 } }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 390 + "__id__": 386 }, "propertyPath": [ "_lrot" @@ -8317,7 +8196,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 390 + "__id__": 386 }, "propertyPath": [ "_euler" @@ -8332,16 +8211,105 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 390 + "__id__": 391 }, "propertyPath": [ - "_lscale" + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 140, + "height": 180 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "ffq0KoarVDR6W0xHCmtCV+" + ] + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 371 + }, + "_prefab": { + "__id__": 393 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 392 + }, + "asset": { + "__uuid__": "79e41d70-e29c-4986-98a4-349aa253f58e", + "__expectedType__": "cc.Prefab" + }, + "fileId": "9eIoeBQ/FAuKISfw/S9q2E", + "instance": { + "__id__": 394 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "02yUK89hVIo663GoQbA01E", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 395 + }, + { + "__id__": 397 + }, + { + "__id__": 398 + }, + { + "__id__": 399 + }, + { + "__id__": 400 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 396 + }, + "propertyPath": [ + "_name" + ], + "value": "hero_card" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "9eIoeBQ/FAuKISfw/S9q2E" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 396 + }, + "propertyPath": [ + "_lpos" ], "value": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 + "x": 230, + "y": -10, + "z": 0 } }, { @@ -8349,6 +8317,37 @@ "targetInfo": { "__id__": 396 }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 396 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 401 + }, "propertyPath": [ "_contentSize" ], @@ -8368,17 +8367,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 375 + "__id__": 371 }, "_prefab": { - "__id__": 398 + "__id__": 403 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 397 + "__id__": 402 }, "asset": { "__uuid__": "79e41d70-e29c-4986-98a4-349aa253f58e", @@ -8386,36 +8385,33 @@ }, "fileId": "9eIoeBQ/FAuKISfw/S9q2E", "instance": { - "__id__": 399 + "__id__": 404 }, "targetOverrides": null }, { "__type__": "cc.PrefabInstance", - "fileId": "d4Hd/iZ59Omo35MdUDCSCx", + "fileId": "3dJN1dyy9FHZvh6jdePGIh", "prefabRootNode": { "__id__": 1 }, "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 400 - }, - { - "__id__": 402 - }, - { - "__id__": 403 - }, - { - "__id__": 404 - }, { "__id__": 405 }, { - "__id__": 406 + "__id__": 407 + }, + { + "__id__": 408 + }, + { + "__id__": 409 + }, + { + "__id__": 410 } ], "removedComponents": [] @@ -8423,7 +8419,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 401 + "__id__": 406 }, "propertyPath": [ "_name" @@ -8439,22 +8435,22 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 401 + "__id__": 406 }, "propertyPath": [ "_lpos" ], "value": { "__type__": "cc.Vec3", - "x": -140, - "y": -90, + "x": 380, + "y": -10, "z": 0 } }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 401 + "__id__": 406 }, "propertyPath": [ "_lrot" @@ -8470,7 +8466,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 401 + "__id__": 406 }, "propertyPath": [ "_euler" @@ -8485,22 +8481,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 401 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 407 + "__id__": 411 }, "propertyPath": [ "_contentSize" @@ -8521,17 +8502,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 375 + "__id__": 371 }, "_prefab": { - "__id__": 409 + "__id__": 413 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 408 + "__id__": 412 }, "asset": { "__uuid__": "79e41d70-e29c-4986-98a4-349aa253f58e", @@ -8539,36 +8520,33 @@ }, "fileId": "9eIoeBQ/FAuKISfw/S9q2E", "instance": { - "__id__": 410 + "__id__": 414 }, "targetOverrides": null }, { "__type__": "cc.PrefabInstance", - "fileId": "f0OJ9pqjVMe7tHiSG+MTz2", + "fileId": "39UJkUvrtA84C0T5RDxREc", "prefabRootNode": { "__id__": 1 }, "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 411 - }, - { - "__id__": 413 - }, - { - "__id__": 414 - }, { "__id__": 415 }, { - "__id__": 416 + "__id__": 417 }, { - "__id__": 417 + "__id__": 418 + }, + { + "__id__": 419 + }, + { + "__id__": 420 } ], "removedComponents": [] @@ -8576,12 +8554,12 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 412 + "__id__": 416 }, "propertyPath": [ "_name" ], - "value": "hero_card-001" + "value": "hero_card" }, { "__type__": "cc.TargetInfo", @@ -8592,22 +8570,22 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 412 + "__id__": 416 }, "propertyPath": [ "_lpos" ], "value": { "__type__": "cc.Vec3", - "x": 0, - "y": -90, + "x": 530, + "y": -10, "z": 0 } }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 412 + "__id__": 416 }, "propertyPath": [ "_lrot" @@ -8623,7 +8601,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 412 + "__id__": 416 }, "propertyPath": [ "_euler" @@ -8638,22 +8616,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 412 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 418 + "__id__": 421 }, "propertyPath": [ "_contentSize" @@ -8674,17 +8637,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 375 + "__id__": 371 }, "_prefab": { - "__id__": 420 + "__id__": 423 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 419 + "__id__": 422 }, "asset": { "__uuid__": "79e41d70-e29c-4986-98a4-349aa253f58e", @@ -8692,36 +8655,33 @@ }, "fileId": "9eIoeBQ/FAuKISfw/S9q2E", "instance": { - "__id__": 421 + "__id__": 424 }, "targetOverrides": null }, { "__type__": "cc.PrefabInstance", - "fileId": "9aTQ1fpYhGTJvCzJ93vclR", + "fileId": "fcy94Yo1BBC5mkRRoGZynA", "prefabRootNode": { "__id__": 1 }, "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 422 - }, - { - "__id__": 424 - }, { "__id__": 425 }, - { - "__id__": 426 - }, { "__id__": 427 }, { "__id__": 428 + }, + { + "__id__": 429 + }, + { + "__id__": 430 } ], "removedComponents": [] @@ -8729,12 +8689,12 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 423 + "__id__": 426 }, "propertyPath": [ "_name" ], - "value": "hero_card-002" + "value": "hero_card" }, { "__type__": "cc.TargetInfo", @@ -8745,22 +8705,22 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 423 + "__id__": 426 }, "propertyPath": [ "_lpos" ], "value": { "__type__": "cc.Vec3", - "x": 140, - "y": -90, + "x": 680, + "y": -10, "z": 0 } }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 423 + "__id__": 426 }, "propertyPath": [ "_lrot" @@ -8776,7 +8736,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 423 + "__id__": 426 }, "propertyPath": [ "_euler" @@ -8791,22 +8751,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 423 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 429 + "__id__": 431 }, "propertyPath": [ "_contentSize" @@ -8827,17 +8772,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 375 + "__id__": 371 }, "_prefab": { - "__id__": 431 + "__id__": 433 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 430 + "__id__": 432 }, "asset": { "__uuid__": "79e41d70-e29c-4986-98a4-349aa253f58e", @@ -8845,28 +8790,22 @@ }, "fileId": "9eIoeBQ/FAuKISfw/S9q2E", "instance": { - "__id__": 432 + "__id__": 434 }, "targetOverrides": null }, { "__type__": "cc.PrefabInstance", - "fileId": "6dc/Un2Q9AVYUeftBKLxKM", + "fileId": "77ItRyWsVGRZanD2J+hFu/", "prefabRootNode": { "__id__": 1 }, "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 433 - }, { "__id__": 435 }, - { - "__id__": 436 - }, { "__id__": 437 }, @@ -8875,6 +8814,9 @@ }, { "__id__": 439 + }, + { + "__id__": 440 } ], "removedComponents": [] @@ -8882,12 +8824,12 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 434 + "__id__": 436 }, "propertyPath": [ "_name" ], - "value": "hero_card-003" + "value": "hero_card" }, { "__type__": "cc.TargetInfo", @@ -8898,22 +8840,22 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 434 + "__id__": 436 }, "propertyPath": [ "_lpos" ], "value": { "__type__": "cc.Vec3", - "x": 280, - "y": -90, + "x": 830, + "y": -10, "z": 0 } }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 434 + "__id__": 436 }, "propertyPath": [ "_lrot" @@ -8929,7 +8871,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 434 + "__id__": 436 }, "propertyPath": [ "_euler" @@ -8944,22 +8886,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 434 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 440 + "__id__": 441 }, "propertyPath": [ "_contentSize" @@ -8980,17 +8907,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 375 + "__id__": 371 }, "_prefab": { - "__id__": 442 + "__id__": 443 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 441 + "__id__": 442 }, "asset": { "__uuid__": "79e41d70-e29c-4986-98a4-349aa253f58e", @@ -8998,13 +8925,13 @@ }, "fileId": "9eIoeBQ/FAuKISfw/S9q2E", "instance": { - "__id__": 443 + "__id__": 444 }, "targetOverrides": null }, { "__type__": "cc.PrefabInstance", - "fileId": "36a6u4ZZpGXLcWYvM8PP91", + "fileId": "4aIENz6JlHJ4X54SI4N/Ud", "prefabRootNode": { "__id__": 1 }, @@ -9012,10 +8939,7 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 444 - }, - { - "__id__": 446 + "__id__": 445 }, { "__id__": 447 @@ -9035,12 +8959,12 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 445 + "__id__": 446 }, "propertyPath": [ "_name" ], - "value": "hero_card-004" + "value": "hero_card" }, { "__type__": "cc.TargetInfo", @@ -9051,22 +8975,22 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 445 + "__id__": 446 }, "propertyPath": [ "_lpos" ], "value": { "__type__": "cc.Vec3", - "x": -280, - "y": -270, + "x": 980, + "y": -10, "z": 0 } }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 445 + "__id__": 446 }, "propertyPath": [ "_lrot" @@ -9082,7 +9006,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 445 + "__id__": 446 }, "propertyPath": [ "_euler" @@ -9094,21 +9018,6 @@ "z": 0 } }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 445 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -9133,7 +9042,7 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 375 + "__id__": 371 }, "_prefab": { "__id__": 453 @@ -9157,7 +9066,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "56fab5L4pAfJ4Zm3QxW4GU", + "fileId": "22kHgYAD5BpreHPD186Bzv", "prefabRootNode": { "__id__": 1 }, @@ -9178,9 +9087,6 @@ }, { "__id__": 460 - }, - { - "__id__": 461 } ], "removedComponents": [] @@ -9193,7 +9099,7 @@ "propertyPath": [ "_name" ], - "value": "hero_card-005" + "value": "hero_card" }, { "__type__": "cc.TargetInfo", @@ -9211,8 +9117,8 @@ ], "value": { "__type__": "cc.Vec3", - "x": -140, - "y": -270, + "x": 1130, + "y": -10, "z": 0 } }, @@ -9250,22 +9156,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 456 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 462 + "__id__": 461 }, "propertyPath": [ "_contentSize" @@ -9286,17 +9177,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 375 + "__id__": 371 }, "_prefab": { - "__id__": 464 + "__id__": 463 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 463 + "__id__": 462 }, "asset": { "__uuid__": "79e41d70-e29c-4986-98a4-349aa253f58e", @@ -9304,13 +9195,13 @@ }, "fileId": "9eIoeBQ/FAuKISfw/S9q2E", "instance": { - "__id__": 465 + "__id__": 464 }, "targetOverrides": null }, { "__type__": "cc.PrefabInstance", - "fileId": "e0cRVVmHpPLruIxo7EFWlx", + "fileId": "5cNBR4kcNCUq9ZyVhc+G48", "prefabRootNode": { "__id__": 1 }, @@ -9318,7 +9209,10 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 466 + "__id__": 465 + }, + { + "__id__": 467 }, { "__id__": 468 @@ -9328,12 +9222,6 @@ }, { "__id__": 470 - }, - { - "__id__": 471 - }, - { - "__id__": 472 } ], "removedComponents": [] @@ -9341,12 +9229,12 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 467 + "__id__": 466 }, "propertyPath": [ "_name" ], - "value": "hero_card-006" + "value": "hero_card" }, { "__type__": "cc.TargetInfo", @@ -9357,22 +9245,22 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 467 + "__id__": 466 }, "propertyPath": [ "_lpos" ], "value": { "__type__": "cc.Vec3", - "x": 0, - "y": -270, + "x": 1280, + "y": -10, "z": 0 } }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 467 + "__id__": 466 }, "propertyPath": [ "_lrot" @@ -9388,7 +9276,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 467 + "__id__": 466 }, "propertyPath": [ "_euler" @@ -9403,22 +9291,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 467 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 473 + "__id__": 471 }, "propertyPath": [ "_contentSize" @@ -9439,17 +9312,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 375 + "__id__": 371 }, "_prefab": { - "__id__": 475 + "__id__": 473 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 474 + "__id__": 472 }, "asset": { "__uuid__": "79e41d70-e29c-4986-98a4-349aa253f58e", @@ -9457,36 +9330,33 @@ }, "fileId": "9eIoeBQ/FAuKISfw/S9q2E", "instance": { - "__id__": 476 + "__id__": 474 }, "targetOverrides": null }, { "__type__": "cc.PrefabInstance", - "fileId": "ebkzv6dPBNQoMP/Z7iWF7U", + "fileId": "f97eKAgaNBJ48BLqkTl9Q7", "prefabRootNode": { "__id__": 1 }, "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ + { + "__id__": 475 + }, { "__id__": 477 }, + { + "__id__": 478 + }, { "__id__": 479 }, { "__id__": 480 - }, - { - "__id__": 481 - }, - { - "__id__": 482 - }, - { - "__id__": 483 } ], "removedComponents": [] @@ -9494,12 +9364,12 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 478 + "__id__": 476 }, "propertyPath": [ "_name" ], - "value": "hero_card-007" + "value": "hero_card" }, { "__type__": "cc.TargetInfo", @@ -9510,22 +9380,22 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 478 + "__id__": 476 }, "propertyPath": [ "_lpos" ], "value": { "__type__": "cc.Vec3", - "x": 140, - "y": -270, + "x": 1430, + "y": -10, "z": 0 } }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 478 + "__id__": 476 }, "propertyPath": [ "_lrot" @@ -9541,7 +9411,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 478 + "__id__": 476 }, "propertyPath": [ "_euler" @@ -9556,22 +9426,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 478 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 484 + "__id__": 481 }, "propertyPath": [ "_contentSize" @@ -9592,17 +9447,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 375 + "__id__": 371 }, "_prefab": { - "__id__": 486 + "__id__": 483 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 485 + "__id__": 482 }, "asset": { "__uuid__": "79e41d70-e29c-4986-98a4-349aa253f58e", @@ -9610,36 +9465,33 @@ }, "fileId": "9eIoeBQ/FAuKISfw/S9q2E", "instance": { - "__id__": 487 + "__id__": 484 }, "targetOverrides": null }, { "__type__": "cc.PrefabInstance", - "fileId": "66yd3abD1CcqkOY4Fv8fcI", + "fileId": "46jaqcpHhAFZlJImNYp3GK", "prefabRootNode": { "__id__": 1 }, "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ + { + "__id__": 485 + }, + { + "__id__": 487 + }, { "__id__": 488 }, + { + "__id__": 489 + }, { "__id__": 490 - }, - { - "__id__": 491 - }, - { - "__id__": 492 - }, - { - "__id__": 493 - }, - { - "__id__": 494 } ], "removedComponents": [] @@ -9647,12 +9499,12 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 489 + "__id__": 486 }, "propertyPath": [ "_name" ], - "value": "hero_card-008" + "value": "hero_card" }, { "__type__": "cc.TargetInfo", @@ -9663,22 +9515,22 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 489 + "__id__": 486 }, "propertyPath": [ "_lpos" ], "value": { "__type__": "cc.Vec3", - "x": 280, - "y": -270, + "x": 1580, + "y": -10, "z": 0 } }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 489 + "__id__": 486 }, "propertyPath": [ "_lrot" @@ -9694,7 +9546,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 489 + "__id__": 486 }, "propertyPath": [ "_euler" @@ -9709,787 +9561,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 489 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 495 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 140, - "height": 180 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "ffq0KoarVDR6W0xHCmtCV+" - ] - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 375 - }, - "_prefab": { - "__id__": 497 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 496 - }, - "asset": { - "__uuid__": "79e41d70-e29c-4986-98a4-349aa253f58e", - "__expectedType__": "cc.Prefab" - }, - "fileId": "9eIoeBQ/FAuKISfw/S9q2E", - "instance": { - "__id__": 498 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "b6U0gc7ldAD5QKvtp5L0nZ", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 499 - }, - { - "__id__": 501 - }, - { - "__id__": 502 - }, - { - "__id__": 503 - }, - { - "__id__": 504 - }, - { - "__id__": 505 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 500 - }, - "propertyPath": [ - "_name" - ], - "value": "hero_card-009" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "9eIoeBQ/FAuKISfw/S9q2E" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 500 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": -280, - "y": -450, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 500 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 500 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 500 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 506 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 140, - "height": 180 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "ffq0KoarVDR6W0xHCmtCV+" - ] - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 375 - }, - "_prefab": { - "__id__": 508 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 507 - }, - "asset": { - "__uuid__": "79e41d70-e29c-4986-98a4-349aa253f58e", - "__expectedType__": "cc.Prefab" - }, - "fileId": "9eIoeBQ/FAuKISfw/S9q2E", - "instance": { - "__id__": 509 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "e7dlhJZV1BcZJtF58ux7dS", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 510 - }, - { - "__id__": 512 - }, - { - "__id__": 513 - }, - { - "__id__": 514 - }, - { - "__id__": 515 - }, - { - "__id__": 516 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 511 - }, - "propertyPath": [ - "_name" - ], - "value": "hero_card-010" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "9eIoeBQ/FAuKISfw/S9q2E" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 511 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": -140, - "y": -450, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 511 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 511 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 511 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 517 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 140, - "height": 180 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "ffq0KoarVDR6W0xHCmtCV+" - ] - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 375 - }, - "_prefab": { - "__id__": 519 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 518 - }, - "asset": { - "__uuid__": "79e41d70-e29c-4986-98a4-349aa253f58e", - "__expectedType__": "cc.Prefab" - }, - "fileId": "9eIoeBQ/FAuKISfw/S9q2E", - "instance": { - "__id__": 520 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "69qRM6Bo5O5pxpPNBW6JXF", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 521 - }, - { - "__id__": 523 - }, - { - "__id__": 524 - }, - { - "__id__": 525 - }, - { - "__id__": 526 - }, - { - "__id__": 527 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 522 - }, - "propertyPath": [ - "_name" - ], - "value": "hero_card-011" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "9eIoeBQ/FAuKISfw/S9q2E" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 522 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": -450, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 522 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 522 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 522 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 528 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 140, - "height": 180 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "ffq0KoarVDR6W0xHCmtCV+" - ] - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 375 - }, - "_prefab": { - "__id__": 530 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 529 - }, - "asset": { - "__uuid__": "79e41d70-e29c-4986-98a4-349aa253f58e", - "__expectedType__": "cc.Prefab" - }, - "fileId": "9eIoeBQ/FAuKISfw/S9q2E", - "instance": { - "__id__": 531 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "2co5eBZ3BAKZ2qLqybn4X4", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 532 - }, - { - "__id__": 534 - }, - { - "__id__": 535 - }, - { - "__id__": 536 - }, - { - "__id__": 537 - }, - { - "__id__": 538 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 533 - }, - "propertyPath": [ - "_name" - ], - "value": "hero_card-012" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "9eIoeBQ/FAuKISfw/S9q2E" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 533 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 140, - "y": -450, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 533 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 533 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 533 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 539 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 140, - "height": 180 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "ffq0KoarVDR6W0xHCmtCV+" - ] - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 375 - }, - "_prefab": { - "__id__": 541 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 540 - }, - "asset": { - "__uuid__": "79e41d70-e29c-4986-98a4-349aa253f58e", - "__expectedType__": "cc.Prefab" - }, - "fileId": "9eIoeBQ/FAuKISfw/S9q2E", - "instance": { - "__id__": 542 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "d9QVfNTsdNrYdBJWmgUyg0", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 543 - }, - { - "__id__": 545 - }, - { - "__id__": 546 - }, - { - "__id__": 547 - }, - { - "__id__": 548 - }, - { - "__id__": 549 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 544 - }, - "propertyPath": [ - "_name" - ], - "value": "hero_card-013" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "9eIoeBQ/FAuKISfw/S9q2E" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 544 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 280, - "y": -450, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 544 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 544 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 544 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 550 + "__id__": 491 }, "propertyPath": [ "_contentSize" @@ -10512,21 +9584,21 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 375 + "__id__": 371 }, "_enabled": true, "__prefab": { - "__id__": 552 + "__id__": 493 }, "_contentSize": { "__type__": "cc.Size", - "width": 720, - "height": 600 + "width": 2000, + "height": 200 }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 0.5, - "y": 1 + "x": 0, + "y": 0.5 }, "_id": "" }, @@ -10540,30 +9612,30 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 375 + "__id__": 371 }, "_enabled": true, "__prefab": { - "__id__": 554 + "__id__": 495 }, - "_resizeMode": 2, + "_resizeMode": 0, "_layoutType": 3, "_cellSize": { "__type__": "cc.Size", "width": 140, "height": 180 }, - "_startAxis": 0, + "_startAxis": 1, "_paddingLeft": 10, - "_paddingRight": 0, - "_paddingTop": 0, + "_paddingRight": 30, + "_paddingTop": 20, "_paddingBottom": 0, - "_spacingX": 0, + "_spacingX": 10, "_spacingY": 0, "_verticalDirection": 1, "_horizontalDirection": 0, - "_constraint": 0, - "_constraintNum": 2, + "_constraint": 1, + "_constraintNum": 1, "_affectedByScale": false, "_isAlign": false, "_id": "" @@ -10572,6 +9644,42 @@ "__type__": "cc.CompPrefabInfo", "fileId": "8b3ZJbBOZFP7gmqvmXw0V0" }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 371 + }, + "_enabled": true, + "__prefab": { + "__id__": 497 + }, + "_alignFlags": 9, + "_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": "60D9j5XR5M+Lvd2l78Yp2v" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -10604,16 +9712,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 351 + "__id__": 345 }, "_enabled": true, "__prefab": { - "__id__": 558 + "__id__": 501 }, "_contentSize": { "__type__": "cc.Size", "width": 720, - "height": 500 + "height": 130 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -10632,11 +9740,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 351 + "__id__": 345 }, "_enabled": true, "__prefab": { - "__id__": 560 + "__id__": 503 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10674,18 +9782,18 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 351 + "__id__": 345 }, "_enabled": true, "__prefab": { - "__id__": 562 + "__id__": 505 }, "_alignFlags": 20, "_target": null, "_left": 0, "_right": 0, "_top": 690, - "_bottom": 90, + "_bottom": 140, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -10713,6 +9821,8 @@ "__id__": 0 }, "fileId": "a5n2QVgsxDQpgqHM3UKEXo", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -10725,7 +9835,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 565 + "__id__": 508 }, "_contentSize": { "__type__": "cc.Size", @@ -10753,12 +9863,12 @@ }, "_enabled": true, "__prefab": { - "__id__": 567 + "__id__": 510 }, "_alignFlags": 45, "_target": null, - "_left": -900, - "_right": 900, + "_left": 0, + "_right": 0, "_top": 0, "_bottom": 0, "_horizontalCenter": 0, @@ -10788,6 +9898,8 @@ "__id__": 0 }, "fileId": "c1KnZTam5Ao4NRdbk4kQ7u", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -10800,32 +9912,32 @@ }, "_children": [ { - "__id__": 570 + "__id__": 513 }, { - "__id__": 576 + "__id__": 519 }, { - "__id__": 601 + "__id__": 544 }, { - "__id__": 626 + "__id__": 569 } ], "_active": true, "_components": [ { - "__id__": 651 + "__id__": 594 }, { - "__id__": 653 + "__id__": 596 }, { - "__id__": 655 + "__id__": 598 } ], "_prefab": { - "__id__": 657 + "__id__": 600 }, "_lpos": { "__type__": "cc.Vec3", @@ -10862,20 +9974,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 569 + "__id__": 512 }, "_children": [], "_active": true, "_components": [ { - "__id__": 571 + "__id__": 514 }, { - "__id__": 573 + "__id__": 516 } ], "_prefab": { - "__id__": 575 + "__id__": 518 }, "_lpos": { "__type__": "cc.Vec3", @@ -10912,11 +10024,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 570 + "__id__": 513 }, "_enabled": true, "__prefab": { - "__id__": 572 + "__id__": 515 }, "_contentSize": { "__type__": "cc.Size", @@ -10940,11 +10052,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 570 + "__id__": 513 }, "_enabled": true, "__prefab": { - "__id__": 574 + "__id__": 517 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10998,30 +10110,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 569 + "__id__": 512 }, "_children": [ { - "__id__": 577 + "__id__": 520 }, { - "__id__": 583 + "__id__": 526 }, { - "__id__": 589 + "__id__": 532 } ], "_active": true, "_components": [ { - "__id__": 595 + "__id__": 538 }, { - "__id__": 597 + "__id__": 540 } ], "_prefab": { - "__id__": 600 + "__id__": 543 }, "_lpos": { "__type__": "cc.Vec3", @@ -11058,20 +10170,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 576 + "__id__": 519 }, "_children": [], "_active": true, "_components": [ { - "__id__": 578 + "__id__": 521 }, { - "__id__": 580 + "__id__": 523 } ], "_prefab": { - "__id__": 582 + "__id__": 525 }, "_lpos": { "__type__": "cc.Vec3", @@ -11108,16 +10220,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 577 + "__id__": 520 }, "_enabled": true, "__prefab": { - "__id__": 579 + "__id__": 522 }, "_contentSize": { "__type__": "cc.Size", - "width": 83, - "height": 88 + "width": 80, + "height": 83 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -11136,11 +10248,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 577 + "__id__": 520 }, "_enabled": true, "__prefab": { - "__id__": 581 + "__id__": 524 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11153,10 +10265,10 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@1c159", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@b9426", "__expectedType__": "cc.SpriteFrame" }, - "_type": 0, + "_type": 1, "_fillType": 0, "_sizeMode": 1, "_fillCenter": { @@ -11194,20 +10306,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 576 + "__id__": 519 }, "_children": [], "_active": true, "_components": [ { - "__id__": 584 + "__id__": 527 }, { - "__id__": 586 + "__id__": 529 } ], "_prefab": { - "__id__": 588 + "__id__": 531 }, "_lpos": { "__type__": "cc.Vec3", @@ -11244,11 +10356,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 583 + "__id__": 526 }, "_enabled": true, "__prefab": { - "__id__": 585 + "__id__": 528 }, "_contentSize": { "__type__": "cc.Size", @@ -11272,11 +10384,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 583 + "__id__": 526 }, "_enabled": true, "__prefab": { - "__id__": 587 + "__id__": 530 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11330,20 +10442,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 576 + "__id__": 519 }, "_children": [], "_active": true, "_components": [ { - "__id__": 590 + "__id__": 533 }, { - "__id__": 592 + "__id__": 535 } ], "_prefab": { - "__id__": 594 + "__id__": 537 }, "_lpos": { "__type__": "cc.Vec3", @@ -11380,11 +10492,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 589 + "__id__": 532 }, "_enabled": true, "__prefab": { - "__id__": 591 + "__id__": 534 }, "_contentSize": { "__type__": "cc.Size", @@ -11408,11 +10520,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 589 + "__id__": 532 }, "_enabled": true, "__prefab": { - "__id__": 593 + "__id__": 536 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11489,11 +10601,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 576 + "__id__": 519 }, "_enabled": true, "__prefab": { - "__id__": 596 + "__id__": 539 }, "_contentSize": { "__type__": "cc.Size", @@ -11517,15 +10629,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 576 + "__id__": 519 }, "_enabled": true, "__prefab": { - "__id__": 598 + "__id__": 541 }, "clickEvents": [ { - "__id__": 599 + "__id__": 542 } ], "_interactable": true, @@ -11600,30 +10712,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 569 + "__id__": 512 }, "_children": [ { - "__id__": 602 + "__id__": 545 }, { - "__id__": 608 + "__id__": 551 }, { - "__id__": 614 + "__id__": 557 } ], "_active": true, "_components": [ { - "__id__": 620 + "__id__": 563 }, { - "__id__": 622 + "__id__": 565 } ], "_prefab": { - "__id__": 625 + "__id__": 568 }, "_lpos": { "__type__": "cc.Vec3", @@ -11660,20 +10772,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 601 + "__id__": 544 }, "_children": [], "_active": false, "_components": [ { - "__id__": 603 + "__id__": 546 }, { - "__id__": 605 + "__id__": 548 } ], "_prefab": { - "__id__": 607 + "__id__": 550 }, "_lpos": { "__type__": "cc.Vec3", @@ -11710,16 +10822,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 602 + "__id__": 545 }, "_enabled": true, "__prefab": { - "__id__": 604 + "__id__": 547 }, "_contentSize": { "__type__": "cc.Size", - "width": 83, - "height": 88 + "width": 80, + "height": 83 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -11738,11 +10850,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 602 + "__id__": 545 }, "_enabled": true, "__prefab": { - "__id__": 606 + "__id__": 549 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11755,10 +10867,10 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@1c159", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@b9426", "__expectedType__": "cc.SpriteFrame" }, - "_type": 0, + "_type": 1, "_fillType": 0, "_sizeMode": 1, "_fillCenter": { @@ -11796,20 +10908,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 601 + "__id__": 544 }, "_children": [], "_active": true, "_components": [ { - "__id__": 609 + "__id__": 552 }, { - "__id__": 611 + "__id__": 554 } ], "_prefab": { - "__id__": 613 + "__id__": 556 }, "_lpos": { "__type__": "cc.Vec3", @@ -11846,11 +10958,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 608 + "__id__": 551 }, "_enabled": true, "__prefab": { - "__id__": 610 + "__id__": 553 }, "_contentSize": { "__type__": "cc.Size", @@ -11874,11 +10986,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 608 + "__id__": 551 }, "_enabled": true, "__prefab": { - "__id__": 612 + "__id__": 555 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11932,20 +11044,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 601 + "__id__": 544 }, "_children": [], "_active": true, "_components": [ { - "__id__": 615 + "__id__": 558 }, { - "__id__": 617 + "__id__": 560 } ], "_prefab": { - "__id__": 619 + "__id__": 562 }, "_lpos": { "__type__": "cc.Vec3", @@ -11982,11 +11094,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 614 + "__id__": 557 }, "_enabled": true, "__prefab": { - "__id__": 616 + "__id__": 559 }, "_contentSize": { "__type__": "cc.Size", @@ -12010,11 +11122,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 614 + "__id__": 557 }, "_enabled": true, "__prefab": { - "__id__": 618 + "__id__": 561 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12091,11 +11203,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 601 + "__id__": 544 }, "_enabled": true, "__prefab": { - "__id__": 621 + "__id__": 564 }, "_contentSize": { "__type__": "cc.Size", @@ -12119,15 +11231,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 601 + "__id__": 544 }, "_enabled": true, "__prefab": { - "__id__": 623 + "__id__": 566 }, "clickEvents": [ { - "__id__": 624 + "__id__": 567 } ], "_interactable": true, @@ -12202,30 +11314,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 569 + "__id__": 512 }, "_children": [ { - "__id__": 627 + "__id__": 570 }, { - "__id__": 633 + "__id__": 576 }, { - "__id__": 639 + "__id__": 582 } ], "_active": true, "_components": [ { - "__id__": 645 + "__id__": 588 }, { - "__id__": 647 + "__id__": 590 } ], "_prefab": { - "__id__": 650 + "__id__": 593 }, "_lpos": { "__type__": "cc.Vec3", @@ -12262,20 +11374,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 626 + "__id__": 569 }, "_children": [], "_active": false, "_components": [ { - "__id__": 628 + "__id__": 571 }, { - "__id__": 630 + "__id__": 573 } ], "_prefab": { - "__id__": 632 + "__id__": 575 }, "_lpos": { "__type__": "cc.Vec3", @@ -12312,16 +11424,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 627 + "__id__": 570 }, "_enabled": true, "__prefab": { - "__id__": 629 + "__id__": 572 }, "_contentSize": { "__type__": "cc.Size", - "width": 83, - "height": 88 + "width": 80, + "height": 83 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -12340,11 +11452,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 627 + "__id__": 570 }, "_enabled": true, "__prefab": { - "__id__": 631 + "__id__": 574 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12357,10 +11469,10 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@1c159", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@b9426", "__expectedType__": "cc.SpriteFrame" }, - "_type": 0, + "_type": 1, "_fillType": 0, "_sizeMode": 1, "_fillCenter": { @@ -12398,20 +11510,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 626 + "__id__": 569 }, "_children": [], "_active": true, "_components": [ { - "__id__": 634 + "__id__": 577 }, { - "__id__": 636 + "__id__": 579 } ], "_prefab": { - "__id__": 638 + "__id__": 581 }, "_lpos": { "__type__": "cc.Vec3", @@ -12448,11 +11560,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 633 + "__id__": 576 }, "_enabled": true, "__prefab": { - "__id__": 635 + "__id__": 578 }, "_contentSize": { "__type__": "cc.Size", @@ -12476,11 +11588,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 633 + "__id__": 576 }, "_enabled": true, "__prefab": { - "__id__": 637 + "__id__": 580 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12534,20 +11646,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 626 + "__id__": 569 }, "_children": [], "_active": true, "_components": [ { - "__id__": 640 + "__id__": 583 }, { - "__id__": 642 + "__id__": 585 } ], "_prefab": { - "__id__": 644 + "__id__": 587 }, "_lpos": { "__type__": "cc.Vec3", @@ -12584,11 +11696,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 639 + "__id__": 582 }, "_enabled": true, "__prefab": { - "__id__": 641 + "__id__": 584 }, "_contentSize": { "__type__": "cc.Size", @@ -12612,11 +11724,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 639 + "__id__": 582 }, "_enabled": true, "__prefab": { - "__id__": 643 + "__id__": 586 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12693,11 +11805,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 626 + "__id__": 569 }, "_enabled": true, "__prefab": { - "__id__": 646 + "__id__": 589 }, "_contentSize": { "__type__": "cc.Size", @@ -12721,15 +11833,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 626 + "__id__": 569 }, "_enabled": true, "__prefab": { - "__id__": 648 + "__id__": 591 }, "clickEvents": [ { - "__id__": 649 + "__id__": 592 } ], "_interactable": true, @@ -12804,11 +11916,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 569 + "__id__": 512 }, "_enabled": true, "__prefab": { - "__id__": 652 + "__id__": 595 }, "_contentSize": { "__type__": "cc.Size", @@ -12832,11 +11944,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 569 + "__id__": 512 }, "_enabled": true, "__prefab": { - "__id__": 654 + "__id__": 597 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12874,11 +11986,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 569 + "__id__": 512 }, "_enabled": true, "__prefab": { - "__id__": 656 + "__id__": 599 }, "_alignFlags": 20, "_target": null, @@ -12929,14 +12041,14 @@ "_active": true, "_components": [ { - "__id__": 659 + "__id__": 602 }, { - "__id__": 661 + "__id__": 604 } ], "_prefab": { - "__id__": 663 + "__id__": 606 }, "_lpos": { "__type__": "cc.Vec3", @@ -12973,11 +12085,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 658 + "__id__": 601 }, "_enabled": true, "__prefab": { - "__id__": 660 + "__id__": 603 }, "_contentSize": { "__type__": "cc.Size", @@ -13001,11 +12113,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 658 + "__id__": 601 }, "_enabled": true, "__prefab": { - "__id__": 662 + "__id__": 605 }, "_alignFlags": 12, "_target": null, @@ -13054,7 +12166,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 665 + "__id__": 608 }, "_contentSize": { "__type__": "cc.Size", @@ -13082,7 +12194,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 667 + "__id__": 610 }, "_alignFlags": 45, "_target": null, @@ -13118,7 +12230,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 669 + "__id__": 612 }, "_id": "" }, @@ -13139,49 +12251,37 @@ "targetOverrides": [], "nestedPrefabInstanceRoots": [ { - "__id__": 540 + "__id__": 482 }, { - "__id__": 529 + "__id__": 472 }, { - "__id__": 518 - }, - { - "__id__": 507 - }, - { - "__id__": 496 - }, - { - "__id__": 485 - }, - { - "__id__": 474 - }, - { - "__id__": 463 + "__id__": 462 }, { "__id__": 452 }, { - "__id__": 441 + "__id__": 442 }, { - "__id__": 430 + "__id__": 432 }, { - "__id__": 419 + "__id__": 422 }, { - "__id__": 408 + "__id__": 412 }, { - "__id__": 397 + "__id__": 402 }, { - "__id__": 386 + "__id__": 392 + }, + { + "__id__": 382 }, { "__id__": 304 diff --git a/assets/script/game/map/CardController.ts b/assets/script/game/map/CardController.ts index bcd3d3d0..5ba3f6f8 100644 --- a/assets/script/game/map/CardController.ts +++ b/assets/script/game/map/CardController.ts @@ -40,22 +40,22 @@ export class CardControllerComp extends CCComp { } hh_show(){ - this.node.getChildByName("hero_home").setPosition(v3(0,0,0)); + this.node.getChildByName("hero_home").active = true; } hh_hide(){ - this.node.getChildByName("hero_home").setPosition(v3(1000,0,0)); + this.node.getChildByName("hero_home").active = false; } mh_show(){ - this.node.getChildByName("mission_home").setPosition(v3(0,0,0)); + this.node.getChildByName("mission_home").active=true; } mh_hide(){ - this.node.getChildByName("mission_home").setPosition(v3(1000,0,0)); + this.node.getChildByName("mission_home").active=false; } m_show(){ - this.node.getChildByName("mission").setPosition(v3(0,0,0)); + this.node.getChildByName("mission").active = true; } m_hide(){ - this.node.getChildByName("mission").setPosition(v3(1000,0,0)); + this.node.getChildByName("mission").active = false; } to_mission(){ this.hh_hide()