diff --git a/assets/resources/gui/element/MSkillBox.prefab b/assets/resources/gui/element/MSkillBox.prefab index 3737940d..be06e61b 100644 --- a/assets/resources/gui/element/MSkillBox.prefab +++ b/assets/resources/gui/element/MSkillBox.prefab @@ -23,22 +23,25 @@ }, { "__id__": 10 + }, + { + "__id__": 534 } ], "_active": true, "_components": [ { - "__id__": 534 + "__id__": 564 }, { - "__id__": 536 + "__id__": 566 }, { - "__id__": 538 + "__id__": 568 } ], "_prefab": { - "__id__": 540 + "__id__": 570 }, "_lpos": { "__type__": "cc.Vec3", @@ -170,7 +173,7 @@ "r": 0, "g": 0, "b": 0, - "a": 124 + "a": 255 }, "_spriteFrame": { "__uuid__": "d7d869bc-06aa-4876-806f-487e68b96780@1e2d6", @@ -10476,6 +10479,499 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_prefab": { + "__id__": 535 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 534 + }, + "asset": { + "__uuid__": "93fda804-b794-4119-a287-952a70be15cb", + "__expectedType__": "cc.Prefab" + }, + "fileId": "6dh4o/8p1Cy5An1p6o4Bc3", + "instance": { + "__id__": 536 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "0bV8au7eBA5LL//3hnyfys", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [ + { + "__id__": 537 + } + ], + "propertyOverrides": [ + { + "__id__": 551 + }, + { + "__id__": 553 + }, + { + "__id__": 554 + }, + { + "__id__": 555 + }, + { + "__id__": 556 + }, + { + "__id__": 558 + }, + { + "__id__": 560 + }, + { + "__id__": 562 + } + ], + "removedComponents": [] + }, + { + "__type__": "cc.MountedComponentsInfo", + "targetInfo": { + "__id__": 538 + }, + "components": [ + { + "__id__": 539 + } + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "cbf1XjyLtM3ptfNNcea20y" + ] + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": { + "mountedRoot": { + "__id__": 534 + } + }, + "node": { + "__id__": 540 + }, + "_enabled": true, + "__prefab": { + "__id__": 550 + }, + "_alignFlags": 42, + "_target": null, + "_left": 10.000000000000284, + "_right": 10.000000000000284, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 33.422, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 700, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "hand", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 534 + }, + "_children": [ + { + "__id__": 541 + } + ], + "_active": true, + "_components": [ + { + "__id__": 547 + }, + { + "__id__": 539 + } + ], + "_prefab": { + "__id__": 549 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 33.422, + "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": "hand", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 540 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 542 + }, + { + "__id__": 544 + } + ], + "_prefab": { + "__id__": 546 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 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__": 541 + }, + "_enabled": true, + "__prefab": { + "__id__": 543 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 98, + "height": 111 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "79Vu4Cv05PnJw1LXaSE4DD" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 541 + }, + "_enabled": true, + "__prefab": { + "__id__": 545 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@5990a", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e4qJ7s1yxD9JrYdfGLFkVo" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c98HTacPpLKZkCGXoKpM4T", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 540 + }, + "_enabled": true, + "__prefab": { + "__id__": 548 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 700, + "height": 300 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "8bH6M7VahGk79zZiTESQBG" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "cbf1XjyLtM3ptfNNcea20y", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a0/8WinFxPGomhdzdmLkyR" + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 552 + }, + "propertyPath": [ + "_name" + ], + "value": "guide" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "6dh4o/8p1Cy5An1p6o4Bc3" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 552 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 552 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 552 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 557 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 720.0000000000006, + "height": 1280 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "50NXlbXx9PHYhb8LT2nDRv" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 559 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 33.422, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "cbf1XjyLtM3ptfNNcea20y" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 561 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 700, + "height": 300 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "8bH6M7VahGk79zZiTESQBG" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 563 + }, + "propertyPath": [ + "guide_id" + ], + "value": 1 + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "1fYnYBrbBNgoLyArRX18hs" + ] + }, { "__type__": "cc.UITransform", "_name": "", @@ -10486,7 +10982,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 535 + "__id__": 565 }, "_contentSize": { "__type__": "cc.Size", @@ -10514,7 +11010,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 537 + "__id__": 567 }, "_alignFlags": 45, "_target": null, @@ -10550,7 +11046,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 539 + "__id__": 569 }, "_id": "" }, @@ -10569,51 +11065,6 @@ "fileId": "d0FqR3MNdHHKbJYj7BXmc4", "instance": null, "targetOverrides": [ - { - "__id__": 541 - }, - { - "__id__": 543 - }, - { - "__id__": 545 - }, - { - "__id__": 547 - }, - { - "__id__": 549 - }, - { - "__id__": 551 - }, - { - "__id__": 553 - }, - { - "__id__": 555 - }, - { - "__id__": 557 - }, - { - "__id__": 559 - }, - { - "__id__": 561 - }, - { - "__id__": 563 - }, - { - "__id__": 565 - }, - { - "__id__": 567 - }, - { - "__id__": 569 - }, { "__id__": 571 }, @@ -10622,9 +11073,60 @@ }, { "__id__": 575 + }, + { + "__id__": 577 + }, + { + "__id__": 579 + }, + { + "__id__": 581 + }, + { + "__id__": 583 + }, + { + "__id__": 585 + }, + { + "__id__": 587 + }, + { + "__id__": 589 + }, + { + "__id__": 591 + }, + { + "__id__": 593 + }, + { + "__id__": 595 + }, + { + "__id__": 597 + }, + { + "__id__": 599 + }, + { + "__id__": 601 + }, + { + "__id__": 603 + }, + { + "__id__": 605 + }, + { + "__id__": 607 } ], "nestedPrefabInstanceRoots": [ + { + "__id__": 534 + }, { "__id__": 329 }, @@ -10648,336 +11150,6 @@ "target": { "__id__": 25 }, - "targetInfo": { - "__id__": 542 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c1DUjdrfNI6Jnt+H+dT4VQ" - ] - }, - { - "__type__": "cc.TargetOverrideInfo", - "source": { - "__id__": 32 - }, - "sourceInfo": null, - "propertyPath": [ - "Ckind_node" - ], - "target": { - "__id__": 25 - }, - "targetInfo": { - "__id__": 544 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "2b5S+tVLtA5Ykc/qVoMdAC" - ] - }, - { - "__type__": "cc.TargetOverrideInfo", - "source": { - "__id__": 32 - }, - "sourceInfo": null, - "propertyPath": [ - "BG_node" - ], - "target": { - "__id__": 25 - }, - "targetInfo": { - "__id__": 546 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "40n0LdBjNFe5UPFihdLgY/" - ] - }, - { - "__type__": "cc.TargetOverrideInfo", - "source": { - "__id__": 32 - }, - "sourceInfo": null, - "propertyPath": [ - "icon_node" - ], - "target": { - "__id__": 25 - }, - "targetInfo": { - "__id__": 548 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "08p7XmUnpCJKHgFSs+XBKi" - ] - }, - { - "__type__": "cc.TargetOverrideInfo", - "source": { - "__id__": 32 - }, - "sourceInfo": null, - "propertyPath": [ - "cost_node" - ], - "target": { - "__id__": 25 - }, - "targetInfo": { - "__id__": 550 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "cfMbf11IxHErK52FqmJHts" - ] - }, - { - "__type__": "cc.TargetOverrideInfo", - "source": { - "__id__": 32 - }, - "sourceInfo": null, - "propertyPath": [ - "name_node" - ], - "target": { - "__id__": 25 - }, - "targetInfo": { - "__id__": 552 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c6fA+I52NLy7nwIG/TAXFX" - ] - }, - { - "__type__": "cc.TargetOverrideInfo", - "source": { - "__id__": 184 - }, - "sourceInfo": null, - "propertyPath": [ - "BG_node" - ], - "target": { - "__id__": 177 - }, - "targetInfo": { - "__id__": 554 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "40n0LdBjNFe5UPFihdLgY/" - ] - }, - { - "__type__": "cc.TargetOverrideInfo", - "source": { - "__id__": 184 - }, - "sourceInfo": null, - "propertyPath": [ - "icon_node" - ], - "target": { - "__id__": 177 - }, - "targetInfo": { - "__id__": 556 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "08p7XmUnpCJKHgFSs+XBKi" - ] - }, - { - "__type__": "cc.TargetOverrideInfo", - "source": { - "__id__": 184 - }, - "sourceInfo": null, - "propertyPath": [ - "name_node" - ], - "target": { - "__id__": 177 - }, - "targetInfo": { - "__id__": 558 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c6fA+I52NLy7nwIG/TAXFX" - ] - }, - { - "__type__": "cc.TargetOverrideInfo", - "source": { - "__id__": 184 - }, - "sourceInfo": null, - "propertyPath": [ - "cost_node" - ], - "target": { - "__id__": 177 - }, - "targetInfo": { - "__id__": 560 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "cfMbf11IxHErK52FqmJHts" - ] - }, - { - "__type__": "cc.TargetOverrideInfo", - "source": { - "__id__": 184 - }, - "sourceInfo": null, - "propertyPath": [ - "Ckind_node" - ], - "target": { - "__id__": 177 - }, - "targetInfo": { - "__id__": 562 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "2b5S+tVLtA5Ykc/qVoMdAC" - ] - }, - { - "__type__": "cc.TargetOverrideInfo", - "source": { - "__id__": 184 - }, - "sourceInfo": null, - "propertyPath": [ - "info_node" - ], - "target": { - "__id__": 177 - }, - "targetInfo": { - "__id__": 564 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c1DUjdrfNI6Jnt+H+dT4VQ" - ] - }, - { - "__type__": "cc.TargetOverrideInfo", - "source": { - "__id__": 336 - }, - "sourceInfo": null, - "propertyPath": [ - "name_node" - ], - "target": { - "__id__": 329 - }, - "targetInfo": { - "__id__": 566 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c6fA+I52NLy7nwIG/TAXFX" - ] - }, - { - "__type__": "cc.TargetOverrideInfo", - "source": { - "__id__": 336 - }, - "sourceInfo": null, - "propertyPath": [ - "icon_node" - ], - "target": { - "__id__": 329 - }, - "targetInfo": { - "__id__": 568 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "08p7XmUnpCJKHgFSs+XBKi" - ] - }, - { - "__type__": "cc.TargetOverrideInfo", - "source": { - "__id__": 336 - }, - "sourceInfo": null, - "propertyPath": [ - "BG_node" - ], - "target": { - "__id__": 329 - }, - "targetInfo": { - "__id__": 570 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "40n0LdBjNFe5UPFihdLgY/" - ] - }, - { - "__type__": "cc.TargetOverrideInfo", - "source": { - "__id__": 336 - }, - "sourceInfo": null, - "propertyPath": [ - "cost_node" - ], - "target": { - "__id__": 329 - }, "targetInfo": { "__id__": 572 } @@ -10985,20 +11157,20 @@ { "__type__": "cc.TargetInfo", "localID": [ - "cfMbf11IxHErK52FqmJHts" + "c1DUjdrfNI6Jnt+H+dT4VQ" ] }, { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 336 + "__id__": 32 }, "sourceInfo": null, "propertyPath": [ "Ckind_node" ], "target": { - "__id__": 329 + "__id__": 25 }, "targetInfo": { "__id__": 574 @@ -11010,6 +11182,336 @@ "2b5S+tVLtA5Ykc/qVoMdAC" ] }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 32 + }, + "sourceInfo": null, + "propertyPath": [ + "BG_node" + ], + "target": { + "__id__": 25 + }, + "targetInfo": { + "__id__": 576 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "40n0LdBjNFe5UPFihdLgY/" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 32 + }, + "sourceInfo": null, + "propertyPath": [ + "icon_node" + ], + "target": { + "__id__": 25 + }, + "targetInfo": { + "__id__": 578 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "08p7XmUnpCJKHgFSs+XBKi" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 32 + }, + "sourceInfo": null, + "propertyPath": [ + "cost_node" + ], + "target": { + "__id__": 25 + }, + "targetInfo": { + "__id__": 580 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "cfMbf11IxHErK52FqmJHts" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 32 + }, + "sourceInfo": null, + "propertyPath": [ + "name_node" + ], + "target": { + "__id__": 25 + }, + "targetInfo": { + "__id__": 582 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "c6fA+I52NLy7nwIG/TAXFX" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 184 + }, + "sourceInfo": null, + "propertyPath": [ + "BG_node" + ], + "target": { + "__id__": 177 + }, + "targetInfo": { + "__id__": 584 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "40n0LdBjNFe5UPFihdLgY/" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 184 + }, + "sourceInfo": null, + "propertyPath": [ + "icon_node" + ], + "target": { + "__id__": 177 + }, + "targetInfo": { + "__id__": 586 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "08p7XmUnpCJKHgFSs+XBKi" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 184 + }, + "sourceInfo": null, + "propertyPath": [ + "name_node" + ], + "target": { + "__id__": 177 + }, + "targetInfo": { + "__id__": 588 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "c6fA+I52NLy7nwIG/TAXFX" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 184 + }, + "sourceInfo": null, + "propertyPath": [ + "cost_node" + ], + "target": { + "__id__": 177 + }, + "targetInfo": { + "__id__": 590 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "cfMbf11IxHErK52FqmJHts" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 184 + }, + "sourceInfo": null, + "propertyPath": [ + "Ckind_node" + ], + "target": { + "__id__": 177 + }, + "targetInfo": { + "__id__": 592 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "2b5S+tVLtA5Ykc/qVoMdAC" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 184 + }, + "sourceInfo": null, + "propertyPath": [ + "info_node" + ], + "target": { + "__id__": 177 + }, + "targetInfo": { + "__id__": 594 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "c1DUjdrfNI6Jnt+H+dT4VQ" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 336 + }, + "sourceInfo": null, + "propertyPath": [ + "name_node" + ], + "target": { + "__id__": 329 + }, + "targetInfo": { + "__id__": 596 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "c6fA+I52NLy7nwIG/TAXFX" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 336 + }, + "sourceInfo": null, + "propertyPath": [ + "icon_node" + ], + "target": { + "__id__": 329 + }, + "targetInfo": { + "__id__": 598 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "08p7XmUnpCJKHgFSs+XBKi" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 336 + }, + "sourceInfo": null, + "propertyPath": [ + "BG_node" + ], + "target": { + "__id__": 329 + }, + "targetInfo": { + "__id__": 600 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "40n0LdBjNFe5UPFihdLgY/" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 336 + }, + "sourceInfo": null, + "propertyPath": [ + "cost_node" + ], + "target": { + "__id__": 329 + }, + "targetInfo": { + "__id__": 602 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "cfMbf11IxHErK52FqmJHts" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 336 + }, + "sourceInfo": null, + "propertyPath": [ + "Ckind_node" + ], + "target": { + "__id__": 329 + }, + "targetInfo": { + "__id__": 604 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "2b5S+tVLtA5Ykc/qVoMdAC" + ] + }, { "__type__": "cc.TargetOverrideInfo", "source": { @@ -11023,7 +11525,7 @@ "__id__": 329 }, "targetInfo": { - "__id__": 576 + "__id__": 606 } }, { @@ -11031,5 +11533,35 @@ "localID": [ "c1DUjdrfNI6Jnt+H+dT4VQ" ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 534 + }, + "sourceInfo": { + "__id__": 608 + }, + "propertyPath": [ + "hand" + ], + "target": { + "__id__": 534 + }, + "targetInfo": { + "__id__": 609 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "1fYnYBrbBNgoLyArRX18hs" + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "cbf1XjyLtM3ptfNNcea20y" + ] } ] \ No newline at end of file diff --git a/assets/resources/gui/element/guide.prefab b/assets/resources/gui/element/guide.prefab new file mode 100644 index 00000000..fc83723b --- /dev/null +++ b/assets/resources/gui/element/guide.prefab @@ -0,0 +1,394 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "guide", + "_objFlags": 0, + "__editorExtras__": {}, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "persistent": false + }, + { + "__type__": "cc.Node", + "_name": "guide", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": null, + "_children": [ + { + "__id__": 2 + } + ], + "_active": true, + "_components": [ + { + "__id__": 12 + }, + { + "__id__": 14 + }, + { + "__id__": 16 + } + ], + "_prefab": { + "__id__": 18 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 640, + "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": "hand", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 3 + } + ], + "_active": true, + "_components": [ + { + "__id__": 9 + } + ], + "_prefab": { + "__id__": 11 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -294.238, + "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": "hand", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 4 + }, + { + "__id__": 6 + } + ], + "_prefab": { + "__id__": 8 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 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__": 3 + }, + "_enabled": true, + "__prefab": { + "__id__": 5 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 98, + "height": 111 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "79Vu4Cv05PnJw1LXaSE4DD" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 3 + }, + "_enabled": true, + "__prefab": { + "__id__": 7 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@5990a", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e4qJ7s1yxD9JrYdfGLFkVo" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c98HTacPpLKZkCGXoKpM4T", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 10 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 400, + "height": 140 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "8bH6M7VahGk79zZiTESQBG" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "cbf1XjyLtM3ptfNNcea20y", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 13 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 720, + "height": 1280 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "50NXlbXx9PHYhb8LT2nDRv" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 15 + }, + "_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": 100, + "_originalHeight": 100, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "10DsksGxZDUbKjtrjCTMxF" + }, + { + "__type__": "25122z/cnRPhp90+CJYs5+r", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 17 + }, + "hand": { + "__id__": 2 + }, + "guide_id": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "1fYnYBrbBNgoLyArRX18hs" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "6dh4o/8p1Cy5An1p6o4Bc3", + "targetOverrides": null + } +] \ No newline at end of file diff --git a/assets/resources/gui/element/guide.prefab.meta b/assets/resources/gui/element/guide.prefab.meta new file mode 100644 index 00000000..f87f638a --- /dev/null +++ b/assets/resources/gui/element/guide.prefab.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.50", + "importer": "prefab", + "imported": true, + "uuid": "93fda804-b794-4119-a287-952a70be15cb", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "syncNodeName": "guide" + } +} diff --git a/assets/resources/gui/element/mission.prefab b/assets/resources/gui/element/mission.prefab index ec0694be..626e7213 100644 --- a/assets/resources/gui/element/mission.prefab +++ b/assets/resources/gui/element/mission.prefab @@ -35,34 +35,37 @@ }, { "__id__": 703 + }, + { + "__id__": 1501 } ], "_active": true, "_components": [ { - "__id__": 1497 + "__id__": 1529 }, { - "__id__": 1499 + "__id__": 1531 }, { - "__id__": 1501 + "__id__": 1533 }, { - "__id__": 1503 + "__id__": 1535 }, { - "__id__": 1505 + "__id__": 1537 }, { - "__id__": 1507 + "__id__": 1539 }, { - "__id__": 1577 + "__id__": 1609 } ], "_prefab": { - "__id__": 1579 + "__id__": 1611 }, "_lpos": { "__type__": "cc.Vec3", @@ -15018,6 +15021,9 @@ }, { "__id__": 1495 + }, + { + "__id__": 1497 } ] }, @@ -15365,7 +15371,7 @@ "propertyPath": [ "_active" ], - "value": true + "value": false }, { "__type__": "CCPropertyOverrideInfo", @@ -27776,6 +27782,510 @@ "c1DUjdrfNI6Jnt+H+dT4VQ" ] }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 1498 + }, + "sourceInfo": { + "__id__": 1499 + }, + "propertyPath": [ + "hand" + ], + "target": { + "__id__": 1498 + }, + "targetInfo": { + "__id__": 1500 + } + }, + { + "__type__": "cc.Node", + "__editorExtras__": {} + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "1fYnYBrbBNgoLyArRX18hs" + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "cbf1XjyLtM3ptfNNcea20y" + ] + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_prefab": { + "__id__": 1502 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1501 + }, + "asset": { + "__uuid__": "93fda804-b794-4119-a287-952a70be15cb", + "__expectedType__": "cc.Prefab" + }, + "fileId": "6dh4o/8p1Cy5An1p6o4Bc3", + "instance": { + "__id__": 1503 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "adsuoqXhpC2YaNqYDp+Yt+", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [ + { + "__id__": 1504 + } + ], + "propertyOverrides": [ + { + "__id__": 1518 + }, + { + "__id__": 1520 + }, + { + "__id__": 1521 + }, + { + "__id__": 1522 + }, + { + "__id__": 1523 + }, + { + "__id__": 1525 + }, + { + "__id__": 1527 + } + ], + "removedComponents": [] + }, + { + "__type__": "cc.MountedComponentsInfo", + "targetInfo": { + "__id__": 1505 + }, + "components": [ + { + "__id__": 1506 + } + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "cbf1XjyLtM3ptfNNcea20y" + ] + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": { + "mountedRoot": { + "__id__": 1501 + } + }, + "node": { + "__id__": 1507 + }, + "_enabled": true, + "__prefab": { + "__id__": 1517 + }, + "_alignFlags": 44, + "_target": null, + "_left": 18.466000000000008, + "_right": 181.534, + "_top": 0, + "_bottom": 36.194999999999936, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 520, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "hand", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1501 + }, + "_children": [ + { + "__id__": 1508 + } + ], + "_active": true, + "_components": [ + { + "__id__": 1514 + }, + { + "__id__": 1506 + } + ], + "_prefab": { + "__id__": 1516 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -81.53399999999999, + "y": -503.80500000000006, + "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": "hand", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1507 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 1509 + }, + { + "__id__": 1511 + } + ], + "_prefab": { + "__id__": 1513 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 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__": 1508 + }, + "_enabled": true, + "__prefab": { + "__id__": 1510 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 98, + "height": 111 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "79Vu4Cv05PnJw1LXaSE4DD" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1508 + }, + "_enabled": true, + "__prefab": { + "__id__": 1512 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@5990a", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e4qJ7s1yxD9JrYdfGLFkVo" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c98HTacPpLKZkCGXoKpM4T", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1507 + }, + "_enabled": true, + "__prefab": { + "__id__": 1515 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 520, + "height": 200 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "8bH6M7VahGk79zZiTESQBG" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "cbf1XjyLtM3ptfNNcea20y", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "6bJdhw/u9LEaGed4GcADt6" + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 1519 + }, + "propertyPath": [ + "_name" + ], + "value": "guide" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "6dh4o/8p1Cy5An1p6o4Bc3" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 1519 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 640, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 1519 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 1519 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 1524 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": -81.53399999999999, + "y": -503.80500000000006, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "cbf1XjyLtM3ptfNNcea20y" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 1526 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 520, + "height": 200 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "8bH6M7VahGk79zZiTESQBG" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 1528 + }, + "propertyPath": [ + "guide_id" + ], + "value": 2 + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "1fYnYBrbBNgoLyArRX18hs" + ] + }, { "__type__": "cc.UITransform", "_name": "", @@ -27786,7 +28296,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1498 + "__id__": 1530 }, "_contentSize": { "__type__": "cc.Size", @@ -27814,7 +28324,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1500 + "__id__": 1532 }, "_alignFlags": 21, "_target": null, @@ -27850,7 +28360,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1502 + "__id__": 1534 }, "debugMode": false, "showMemoryPanel": true, @@ -27883,7 +28393,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1504 + "__id__": 1536 }, "_id": "" }, @@ -27901,7 +28411,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1506 + "__id__": 1538 }, "debugMode": false, "_id": "" @@ -27920,7 +28430,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1508 + "__id__": 1540 }, "cards_node": { "__id__": 130 @@ -27965,13 +28475,13 @@ "__id__": 1261 }, "skill_refresh": { - "__id__": 1509 + "__id__": 1541 }, "skill_ad_refresh": { - "__id__": 1535 + "__id__": 1567 }, "skill_refresh_num_node": { - "__id__": 1563 + "__id__": 1595 }, "_id": "" }, @@ -27985,30 +28495,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1510 + "__id__": 1542 }, "_children": [ { - "__id__": 1557 + "__id__": 1589 }, { - "__id__": 1563 + "__id__": 1595 } ], "_active": true, "_components": [ { - "__id__": 1569 + "__id__": 1601 }, { - "__id__": 1571 + "__id__": 1603 }, { - "__id__": 1573 + "__id__": 1605 } ], "_prefab": { - "__id__": 1576 + "__id__": 1608 }, "_lpos": { "__type__": "cc.Vec3", @@ -28045,30 +28555,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1511 + "__id__": 1543 }, "_children": [ { - "__id__": 1509 + "__id__": 1541 }, { - "__id__": 1535 + "__id__": 1567 } ], "_active": true, "_components": [ { - "__id__": 1550 + "__id__": 1582 }, { - "__id__": 1552 + "__id__": 1584 }, { - "__id__": 1554 + "__id__": 1586 } ], "_prefab": { - "__id__": 1556 + "__id__": 1588 }, "_lpos": { "__type__": "cc.Vec3", @@ -28109,7 +28619,7 @@ }, "_children": [ { - "__id__": 1512 + "__id__": 1544 }, { "__id__": 785 @@ -28121,26 +28631,26 @@ "__id__": 1261 }, { - "__id__": 1510 + "__id__": 1542 } ], "_active": true, "_components": [ { - "__id__": 1526 + "__id__": 1558 }, { - "__id__": 1528 + "__id__": 1560 }, { - "__id__": 1530 + "__id__": 1562 }, { - "__id__": 1532 + "__id__": 1564 } ], "_prefab": { - "__id__": 1534 + "__id__": 1566 }, "_lpos": { "__type__": "cc.Vec3", @@ -28177,24 +28687,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1511 + "__id__": 1543 }, "_children": [ { - "__id__": 1513 + "__id__": 1545 } ], "_active": true, "_components": [ { - "__id__": 1521 + "__id__": 1553 }, { - "__id__": 1523 + "__id__": 1555 } ], "_prefab": { - "__id__": 1525 + "__id__": 1557 }, "_lpos": { "__type__": "cc.Vec3", @@ -28231,23 +28741,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1512 + "__id__": 1544 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1514 + "__id__": 1546 }, { - "__id__": 1516 + "__id__": 1548 }, { - "__id__": 1518 + "__id__": 1550 } ], "_prefab": { - "__id__": 1520 + "__id__": 1552 }, "_lpos": { "__type__": "cc.Vec3", @@ -28284,11 +28794,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1513 + "__id__": 1545 }, "_enabled": true, "__prefab": { - "__id__": 1515 + "__id__": 1547 }, "_contentSize": { "__type__": "cc.Size", @@ -28312,11 +28822,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1513 + "__id__": 1545 }, "_enabled": true, "__prefab": { - "__id__": 1517 + "__id__": 1549 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -28360,11 +28870,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1513 + "__id__": 1545 }, "_enabled": true, "__prefab": { - "__id__": 1519 + "__id__": 1551 }, "_alignFlags": 45, "_target": null, @@ -28409,11 +28919,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1512 + "__id__": 1544 }, "_enabled": true, "__prefab": { - "__id__": 1522 + "__id__": 1554 }, "_contentSize": { "__type__": "cc.Size", @@ -28437,11 +28947,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1512 + "__id__": 1544 }, "_enabled": false, "__prefab": { - "__id__": 1524 + "__id__": 1556 }, "_alignFlags": 42, "_target": null, @@ -28486,11 +28996,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1511 + "__id__": 1543 }, "_enabled": true, "__prefab": { - "__id__": 1527 + "__id__": 1559 }, "_contentSize": { "__type__": "cc.Size", @@ -28514,11 +29024,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1511 + "__id__": 1543 }, "_enabled": true, "__prefab": { - "__id__": 1529 + "__id__": 1561 }, "_alignFlags": 42, "_target": null, @@ -28550,11 +29060,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1511 + "__id__": 1543 }, "_enabled": false, "__prefab": { - "__id__": 1531 + "__id__": 1563 }, "_resizeMode": 1, "_layoutType": 1, @@ -28588,11 +29098,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1511 + "__id__": 1543 }, "_enabled": true, "__prefab": { - "__id__": 1533 + "__id__": 1565 }, "_id": "" }, @@ -28619,27 +29129,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1510 + "__id__": 1542 }, "_children": [ { - "__id__": 1536 + "__id__": 1568 } ], "_active": true, "_components": [ { - "__id__": 1542 + "__id__": 1574 }, { - "__id__": 1544 + "__id__": 1576 }, { - "__id__": 1546 + "__id__": 1578 } ], "_prefab": { - "__id__": 1549 + "__id__": 1581 }, "_lpos": { "__type__": "cc.Vec3", @@ -28676,20 +29186,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1535 + "__id__": 1567 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1537 + "__id__": 1569 }, { - "__id__": 1539 + "__id__": 1571 } ], "_prefab": { - "__id__": 1541 + "__id__": 1573 }, "_lpos": { "__type__": "cc.Vec3", @@ -28726,11 +29236,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1536 + "__id__": 1568 }, "_enabled": true, "__prefab": { - "__id__": 1538 + "__id__": 1570 }, "_contentSize": { "__type__": "cc.Size", @@ -28754,11 +29264,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1536 + "__id__": 1568 }, "_enabled": true, "__prefab": { - "__id__": 1540 + "__id__": 1572 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -28835,11 +29345,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1535 + "__id__": 1567 }, "_enabled": true, "__prefab": { - "__id__": 1543 + "__id__": 1575 }, "_contentSize": { "__type__": "cc.Size", @@ -28863,11 +29373,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1535 + "__id__": 1567 }, "_enabled": true, "__prefab": { - "__id__": 1545 + "__id__": 1577 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -28911,15 +29421,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1535 + "__id__": 1567 }, "_enabled": true, "__prefab": { - "__id__": 1547 + "__id__": 1579 }, "clickEvents": [ { - "__id__": 1548 + "__id__": 1580 } ], "_interactable": true, @@ -28994,11 +29504,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1510 + "__id__": 1542 }, "_enabled": true, "__prefab": { - "__id__": 1551 + "__id__": 1583 }, "_contentSize": { "__type__": "cc.Size", @@ -29022,11 +29532,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1510 + "__id__": 1542 }, "_enabled": true, "__prefab": { - "__id__": 1553 + "__id__": 1585 }, "_resizeMode": 1, "_layoutType": 1, @@ -29060,11 +29570,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1510 + "__id__": 1542 }, "_enabled": false, "__prefab": { - "__id__": 1555 + "__id__": 1587 }, "_alignFlags": 2, "_target": null, @@ -29109,20 +29619,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1509 + "__id__": 1541 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1558 + "__id__": 1590 }, { - "__id__": 1560 + "__id__": 1592 } ], "_prefab": { - "__id__": 1562 + "__id__": 1594 }, "_lpos": { "__type__": "cc.Vec3", @@ -29159,11 +29669,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1557 + "__id__": 1589 }, "_enabled": true, "__prefab": { - "__id__": 1559 + "__id__": 1591 }, "_contentSize": { "__type__": "cc.Size", @@ -29187,11 +29697,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1557 + "__id__": 1589 }, "_enabled": true, "__prefab": { - "__id__": 1561 + "__id__": 1593 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -29268,20 +29778,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1509 + "__id__": 1541 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1564 + "__id__": 1596 }, { - "__id__": 1566 + "__id__": 1598 } ], "_prefab": { - "__id__": 1568 + "__id__": 1600 }, "_lpos": { "__type__": "cc.Vec3", @@ -29318,11 +29828,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1563 + "__id__": 1595 }, "_enabled": true, "__prefab": { - "__id__": 1565 + "__id__": 1597 }, "_contentSize": { "__type__": "cc.Size", @@ -29346,11 +29856,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1563 + "__id__": 1595 }, "_enabled": true, "__prefab": { - "__id__": 1567 + "__id__": 1599 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -29427,11 +29937,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1509 + "__id__": 1541 }, "_enabled": true, "__prefab": { - "__id__": 1570 + "__id__": 1602 }, "_contentSize": { "__type__": "cc.Size", @@ -29455,11 +29965,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1509 + "__id__": 1541 }, "_enabled": true, "__prefab": { - "__id__": 1572 + "__id__": 1604 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -29503,15 +30013,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1509 + "__id__": 1541 }, "_enabled": true, "__prefab": { - "__id__": 1574 + "__id__": 1606 }, "clickEvents": [ { - "__id__": 1575 + "__id__": 1607 } ], "_interactable": true, @@ -29590,7 +30100,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1578 + "__id__": 1610 }, "skill_box": { "__uuid__": "d19cde30-f5d0-47de-a0d5-3a272b696343", @@ -29614,61 +30124,67 @@ "instance": null, "targetOverrides": [ { - "__id__": 1580 + "__id__": 1612 }, { - "__id__": 1583 - }, - { - "__id__": 1586 - }, - { - "__id__": 1589 - }, - { - "__id__": 1592 - }, - { - "__id__": 1595 - }, - { - "__id__": 1598 - }, - { - "__id__": 1601 - }, - { - "__id__": 1604 - }, - { - "__id__": 1607 - }, - { - "__id__": 1610 - }, - { - "__id__": 1613 - }, - { - "__id__": 1616 + "__id__": 1615 }, { "__id__": 1618 }, { - "__id__": 1620 - }, - { - "__id__": 1622 + "__id__": 1621 }, { "__id__": 1624 }, { - "__id__": 1626 + "__id__": 1627 + }, + { + "__id__": 1630 + }, + { + "__id__": 1633 + }, + { + "__id__": 1636 + }, + { + "__id__": 1639 + }, + { + "__id__": 1642 + }, + { + "__id__": 1645 + }, + { + "__id__": 1648 + }, + { + "__id__": 1650 + }, + { + "__id__": 1652 + }, + { + "__id__": 1654 + }, + { + "__id__": 1656 + }, + { + "__id__": 1658 + }, + { + "__id__": 1660 } ], "nestedPrefabInstanceRoots": [ + { + "__id__": 1501 + }, { "__id__": 703 }, @@ -29710,7 +30226,7 @@ "__id__": 56 }, "sourceInfo": { - "__id__": 1581 + "__id__": 1613 }, "propertyPath": [ "icon_node" @@ -29719,337 +30235,37 @@ "__id__": 56 }, "targetInfo": { - "__id__": 1582 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "11S1XoDG5Ndo+S7MbRH4us" - ] - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "b5xpz003VN+JjcOmrDrKg0" - ] - }, - { - "__type__": "cc.TargetOverrideInfo", - "source": { - "__id__": 56 - }, - "sourceInfo": { - "__id__": 1584 - }, - "propertyPath": [ - "sell_node" - ], - "target": { - "__id__": 56 - }, - "targetInfo": { - "__id__": 1585 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "11S1XoDG5Ndo+S7MbRH4us" - ] - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "02JrX+YSZAXZFrDj1ZF6Vq" - ] - }, - { - "__type__": "cc.TargetOverrideInfo", - "source": { - "__id__": 67 - }, - "sourceInfo": { - "__id__": 1587 - }, - "propertyPath": [ - "icon_node" - ], - "target": { - "__id__": 67 - }, - "targetInfo": { - "__id__": 1588 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "11S1XoDG5Ndo+S7MbRH4us" - ] - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "b5xpz003VN+JjcOmrDrKg0" - ] - }, - { - "__type__": "cc.TargetOverrideInfo", - "source": { - "__id__": 67 - }, - "sourceInfo": { - "__id__": 1590 - }, - "propertyPath": [ - "sell_node" - ], - "target": { - "__id__": 67 - }, - "targetInfo": { - "__id__": 1591 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "11S1XoDG5Ndo+S7MbRH4us" - ] - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "02JrX+YSZAXZFrDj1ZF6Vq" - ] - }, - { - "__type__": "cc.TargetOverrideInfo", - "source": { - "__id__": 78 - }, - "sourceInfo": { - "__id__": 1593 - }, - "propertyPath": [ - "icon_node" - ], - "target": { - "__id__": 78 - }, - "targetInfo": { - "__id__": 1594 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "11S1XoDG5Ndo+S7MbRH4us" - ] - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "b5xpz003VN+JjcOmrDrKg0" - ] - }, - { - "__type__": "cc.TargetOverrideInfo", - "source": { - "__id__": 78 - }, - "sourceInfo": { - "__id__": 1596 - }, - "propertyPath": [ - "sell_node" - ], - "target": { - "__id__": 78 - }, - "targetInfo": { - "__id__": 1597 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "11S1XoDG5Ndo+S7MbRH4us" - ] - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "02JrX+YSZAXZFrDj1ZF6Vq" - ] - }, - { - "__type__": "cc.TargetOverrideInfo", - "source": { - "__id__": 88 - }, - "sourceInfo": { - "__id__": 1599 - }, - "propertyPath": [ - "icon_node" - ], - "target": { - "__id__": 88 - }, - "targetInfo": { - "__id__": 1600 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "11S1XoDG5Ndo+S7MbRH4us" - ] - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "b5xpz003VN+JjcOmrDrKg0" - ] - }, - { - "__type__": "cc.TargetOverrideInfo", - "source": { - "__id__": 88 - }, - "sourceInfo": { - "__id__": 1602 - }, - "propertyPath": [ - "sell_node" - ], - "target": { - "__id__": 88 - }, - "targetInfo": { - "__id__": 1603 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "11S1XoDG5Ndo+S7MbRH4us" - ] - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "02JrX+YSZAXZFrDj1ZF6Vq" - ] - }, - { - "__type__": "cc.TargetOverrideInfo", - "source": { - "__id__": 98 - }, - "sourceInfo": { - "__id__": 1605 - }, - "propertyPath": [ - "icon_node" - ], - "target": { - "__id__": 98 - }, - "targetInfo": { - "__id__": 1606 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "11S1XoDG5Ndo+S7MbRH4us" - ] - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "b5xpz003VN+JjcOmrDrKg0" - ] - }, - { - "__type__": "cc.TargetOverrideInfo", - "source": { - "__id__": 98 - }, - "sourceInfo": { - "__id__": 1608 - }, - "propertyPath": [ - "sell_node" - ], - "target": { - "__id__": 98 - }, - "targetInfo": { - "__id__": 1609 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "11S1XoDG5Ndo+S7MbRH4us" - ] - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "02JrX+YSZAXZFrDj1ZF6Vq" - ] - }, - { - "__type__": "cc.TargetOverrideInfo", - "source": { - "__id__": 108 - }, - "sourceInfo": { - "__id__": 1611 - }, - "propertyPath": [ - "icon_node" - ], - "target": { - "__id__": 108 - }, - "targetInfo": { - "__id__": 1612 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "11S1XoDG5Ndo+S7MbRH4us" - ] - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "b5xpz003VN+JjcOmrDrKg0" - ] - }, - { - "__type__": "cc.TargetOverrideInfo", - "source": { - "__id__": 108 - }, - "sourceInfo": { "__id__": 1614 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "11S1XoDG5Ndo+S7MbRH4us" + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "b5xpz003VN+JjcOmrDrKg0" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 56 + }, + "sourceInfo": { + "__id__": 1616 }, "propertyPath": [ "sell_node" ], "target": { - "__id__": 108 + "__id__": 56 }, "targetInfo": { - "__id__": 1615 + "__id__": 1617 } }, { @@ -30067,7 +30283,307 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 1507 + "__id__": 67 + }, + "sourceInfo": { + "__id__": 1619 + }, + "propertyPath": [ + "icon_node" + ], + "target": { + "__id__": 67 + }, + "targetInfo": { + "__id__": 1620 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "11S1XoDG5Ndo+S7MbRH4us" + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "b5xpz003VN+JjcOmrDrKg0" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 67 + }, + "sourceInfo": { + "__id__": 1622 + }, + "propertyPath": [ + "sell_node" + ], + "target": { + "__id__": 67 + }, + "targetInfo": { + "__id__": 1623 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "11S1XoDG5Ndo+S7MbRH4us" + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "02JrX+YSZAXZFrDj1ZF6Vq" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 78 + }, + "sourceInfo": { + "__id__": 1625 + }, + "propertyPath": [ + "icon_node" + ], + "target": { + "__id__": 78 + }, + "targetInfo": { + "__id__": 1626 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "11S1XoDG5Ndo+S7MbRH4us" + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "b5xpz003VN+JjcOmrDrKg0" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 78 + }, + "sourceInfo": { + "__id__": 1628 + }, + "propertyPath": [ + "sell_node" + ], + "target": { + "__id__": 78 + }, + "targetInfo": { + "__id__": 1629 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "11S1XoDG5Ndo+S7MbRH4us" + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "02JrX+YSZAXZFrDj1ZF6Vq" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 88 + }, + "sourceInfo": { + "__id__": 1631 + }, + "propertyPath": [ + "icon_node" + ], + "target": { + "__id__": 88 + }, + "targetInfo": { + "__id__": 1632 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "11S1XoDG5Ndo+S7MbRH4us" + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "b5xpz003VN+JjcOmrDrKg0" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 88 + }, + "sourceInfo": { + "__id__": 1634 + }, + "propertyPath": [ + "sell_node" + ], + "target": { + "__id__": 88 + }, + "targetInfo": { + "__id__": 1635 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "11S1XoDG5Ndo+S7MbRH4us" + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "02JrX+YSZAXZFrDj1ZF6Vq" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 98 + }, + "sourceInfo": { + "__id__": 1637 + }, + "propertyPath": [ + "icon_node" + ], + "target": { + "__id__": 98 + }, + "targetInfo": { + "__id__": 1638 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "11S1XoDG5Ndo+S7MbRH4us" + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "b5xpz003VN+JjcOmrDrKg0" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 98 + }, + "sourceInfo": { + "__id__": 1640 + }, + "propertyPath": [ + "sell_node" + ], + "target": { + "__id__": 98 + }, + "targetInfo": { + "__id__": 1641 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "11S1XoDG5Ndo+S7MbRH4us" + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "02JrX+YSZAXZFrDj1ZF6Vq" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 108 + }, + "sourceInfo": { + "__id__": 1643 + }, + "propertyPath": [ + "icon_node" + ], + "target": { + "__id__": 108 + }, + "targetInfo": { + "__id__": 1644 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "11S1XoDG5Ndo+S7MbRH4us" + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "b5xpz003VN+JjcOmrDrKg0" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 108 + }, + "sourceInfo": { + "__id__": 1646 + }, + "propertyPath": [ + "sell_node" + ], + "target": { + "__id__": 108 + }, + "targetInfo": { + "__id__": 1647 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "11S1XoDG5Ndo+S7MbRH4us" + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "02JrX+YSZAXZFrDj1ZF6Vq" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 1539 }, "sourceInfo": null, "propertyPath": [ @@ -30077,7 +30593,7 @@ "__id__": 703 }, "targetInfo": { - "__id__": 1617 + "__id__": 1649 } }, { @@ -30090,7 +30606,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 1507 + "__id__": 1539 }, "sourceInfo": null, "propertyPath": [ @@ -30100,7 +30616,7 @@ "__id__": 703 }, "targetInfo": { - "__id__": 1619 + "__id__": 1651 } }, { @@ -30113,7 +30629,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 1507 + "__id__": 1539 }, "sourceInfo": null, "propertyPath": [ @@ -30123,7 +30639,7 @@ "__id__": 703 }, "targetInfo": { - "__id__": 1621 + "__id__": 1653 } }, { @@ -30136,7 +30652,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 1507 + "__id__": 1539 }, "sourceInfo": null, "propertyPath": [ @@ -30146,7 +30662,7 @@ "__id__": 703 }, "targetInfo": { - "__id__": 1623 + "__id__": 1655 } }, { @@ -30158,7 +30674,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 1507 + "__id__": 1539 }, "sourceInfo": null, "propertyPath": [ @@ -30168,7 +30684,7 @@ "__id__": 703 }, "targetInfo": { - "__id__": 1625 + "__id__": 1657 } }, { @@ -30180,7 +30696,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 1507 + "__id__": 1539 }, "sourceInfo": null, "propertyPath": [ @@ -30190,7 +30706,7 @@ "__id__": 703 }, "targetInfo": { - "__id__": 1627 + "__id__": 1659 } }, { @@ -30198,5 +30714,35 @@ "localID": [ "e78qXXnxJLXZV2+Vt8nxhi" ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 1501 + }, + "sourceInfo": { + "__id__": 1661 + }, + "propertyPath": [ + "hand" + ], + "target": { + "__id__": 1501 + }, + "targetInfo": { + "__id__": 1662 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "1fYnYBrbBNgoLyArRX18hs" + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "cbf1XjyLtM3ptfNNcea20y" + ] } ] \ No newline at end of file diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index d4a33f9d..5b5fa11a 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -22,26 +22,26 @@ "__id__": 2 }, { - "__id__": 437 + "__id__": 445 }, { - "__id__": 446 + "__id__": 454 } ], "_active": true, "_components": [ { - "__id__": 459 + "__id__": 467 }, { - "__id__": 461 + "__id__": 469 }, { - "__id__": 463 + "__id__": 471 } ], "_prefab": { - "__id__": 465 + "__id__": 473 }, "_lpos": { "__type__": "cc.Vec3", @@ -100,17 +100,17 @@ "_active": true, "_components": [ { - "__id__": 430 + "__id__": 438 }, { - "__id__": 432 + "__id__": 440 }, { - "__id__": 434 + "__id__": 442 } ], "_prefab": { - "__id__": 436 + "__id__": 444 }, "_lpos": { "__type__": "cc.Vec3", @@ -9423,36 +9423,140 @@ }, { "__type__": "cc.Node", - "_name": "guide", "_objFlags": 0, - "__editorExtras__": {}, "_parent": { "__id__": 2 }, + "_prefab": { + "__id__": 417 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 416 + }, + "asset": { + "__uuid__": "93fda804-b794-4119-a287-952a70be15cb", + "__expectedType__": "cc.Prefab" + }, + "fileId": "6dh4o/8p1Cy5An1p6o4Bc3", + "instance": { + "__id__": 418 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "5aJhr6IKBCvr1yjzfuMlha", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [ + { + "__id__": 419 + } + ], + "propertyOverrides": [ + { + "__id__": 433 + }, + { + "__id__": 435 + }, + { + "__id__": 436 + }, + { + "__id__": 437 + } + ], + "removedComponents": [] + }, + { + "__type__": "cc.MountedComponentsInfo", + "targetInfo": { + "__id__": 420 + }, + "components": [ + { + "__id__": 421 + } + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "cbf1XjyLtM3ptfNNcea20y" + ] + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": { + "mountedRoot": { + "__id__": 416 + } + }, + "node": { + "__id__": 422 + }, + "_enabled": true, + "__prefab": { + "__id__": 432 + }, + "_alignFlags": 44, + "_target": null, + "_left": 160, + "_right": 160, + "_top": 0, + "_bottom": 275.762, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 400, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "hand", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 416 + }, "_children": [ { - "__id__": 417 + "__id__": 423 } ], "_active": true, "_components": [ { - "__id__": 423 + "__id__": 429 }, { - "__id__": 425 - }, - { - "__id__": 427 + "__id__": 421 } ], "_prefab": { - "__id__": 429 + "__id__": 431 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 640, + "y": -294.238, "z": 0 }, "_lrot": { @@ -9484,25 +9588,25 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 416 + "__id__": 422 }, "_children": [], "_active": true, "_components": [ { - "__id__": 418 + "__id__": 424 }, { - "__id__": 420 + "__id__": 426 } ], "_prefab": { - "__id__": 422 + "__id__": 428 }, "_lpos": { "__type__": "cc.Vec3", - "x": 36.036, - "y": -354.417, + "x": 0, + "y": 0, "z": 0 }, "_lrot": { @@ -9534,11 +9638,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 417 + "__id__": 423 }, "_enabled": true, "__prefab": { - "__id__": 419 + "__id__": 425 }, "_contentSize": { "__type__": "cc.Size", @@ -9562,11 +9666,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 417 + "__id__": 423 }, "_enabled": true, "__prefab": { - "__id__": 421 + "__id__": 427 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9582,7 +9686,7 @@ "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@5990a", "__expectedType__": "cc.SpriteFrame" }, - "_type": 0, + "_type": 1, "_fillType": 0, "_sizeMode": 1, "_fillCenter": { @@ -9620,16 +9724,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 416 + "__id__": 422 }, "_enabled": true, "__prefab": { - "__id__": 424 + "__id__": 430 }, "_contentSize": { "__type__": "cc.Size", - "width": 720, - "height": 1280 + "width": 400, + "height": 140 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -9640,64 +9744,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "50NXlbXx9PHYhb8LT2nDRv" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 416 - }, - "_enabled": true, - "__prefab": { - "__id__": 426 - }, - "_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": 100, - "_originalHeight": 100, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "10DsksGxZDUbKjtrjCTMxF" - }, - { - "__type__": "25122z/cnRPhp90+CJYs5+r", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 416 - }, - "_enabled": true, - "__prefab": { - "__id__": 428 - }, - "hand": { - "__id__": 417 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "1fYnYBrbBNgoLyArRX18hs" + "fileId": "8bH6M7VahGk79zZiTESQBG" }, { "__type__": "cc.PrefabInfo", @@ -9707,11 +9754,77 @@ "asset": { "__id__": 0 }, - "fileId": "6dh4o/8p1Cy5An1p6o4Bc3", + "fileId": "cbf1XjyLtM3ptfNNcea20y", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "6b+8SFUXpKIYA8Q2ep3HVS" + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 434 + }, + "propertyPath": [ + "_name" + ], + "value": "guide" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "6dh4o/8p1Cy5An1p6o4Bc3" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 434 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 640, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 434 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 434 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, { "__type__": "cc.UITransform", "_name": "", @@ -9722,7 +9835,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 431 + "__id__": 439 }, "_contentSize": { "__type__": "cc.Size", @@ -9750,7 +9863,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 433 + "__id__": 441 }, "_alignFlags": 21, "_target": null, @@ -9786,7 +9899,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 435 + "__id__": 443 }, "home_btn": { "__id__": 121 @@ -9835,14 +9948,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 438 + "__id__": 446 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 437 + "__id__": 445 }, "asset": { "__uuid__": "26bff847-cd29-48a5-bbfa-c3e2dbda688d", @@ -9850,7 +9963,7 @@ }, "fileId": "5a9CMsVQhKP5Y+UJfTKPbx", "instance": { - "__id__": 439 + "__id__": 447 }, "targetOverrides": null }, @@ -9864,19 +9977,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 440 + "__id__": 448 }, { - "__id__": 442 + "__id__": 450 }, { - "__id__": 443 + "__id__": 451 }, { - "__id__": 444 + "__id__": 452 }, { - "__id__": 445 + "__id__": 453 } ], "removedComponents": [] @@ -9884,7 +9997,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 441 + "__id__": 449 }, "propertyPath": [ "_name" @@ -9900,7 +10013,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 441 + "__id__": 449 }, "propertyPath": [ "_lpos" @@ -9915,7 +10028,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 441 + "__id__": 449 }, "propertyPath": [ "_lrot" @@ -9931,7 +10044,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 441 + "__id__": 449 }, "propertyPath": [ "_euler" @@ -9946,7 +10059,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 441 + "__id__": 449 }, "propertyPath": [ "_active" @@ -9960,14 +10073,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 447 + "__id__": 455 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 446 + "__id__": 454 }, "asset": { "__uuid__": "56aee962-4a5e-45ae-a779-999444d06d18", @@ -9975,7 +10088,7 @@ }, "fileId": "cboM54s0hM07XCtrpFp0/b", "instance": { - "__id__": 448 + "__id__": 456 }, "targetOverrides": null }, @@ -9988,29 +10101,29 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 449 - }, - { - "__id__": 451 - }, - { - "__id__": 452 - }, - { - "__id__": 453 - }, - { - "__id__": 454 - }, - { - "__id__": 456 - }, { "__id__": 457 }, { - "__id__": 458 + "__id__": 459 + }, + { + "__id__": 460 + }, + { + "__id__": 461 + }, + { + "__id__": 462 + }, + { + "__id__": 464 + }, + { + "__id__": 465 + }, + { + "__id__": 466 } ], "removedComponents": [] @@ -10018,7 +10131,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 450 + "__id__": 458 }, "propertyPath": [ "_name" @@ -10034,7 +10147,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 450 + "__id__": 458 }, "propertyPath": [ "_lpos" @@ -10049,7 +10162,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 450 + "__id__": 458 }, "propertyPath": [ "_lrot" @@ -10065,7 +10178,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 450 + "__id__": 458 }, "propertyPath": [ "_euler" @@ -10080,7 +10193,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 455 + "__id__": 463 }, "propertyPath": [ "_top" @@ -10096,7 +10209,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 455 + "__id__": 463 }, "propertyPath": [ "_alignFlags" @@ -10106,7 +10219,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 455 + "__id__": 463 }, "propertyPath": [ "_bottom" @@ -10116,7 +10229,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 450 + "__id__": 458 }, "propertyPath": [ "_active" @@ -10133,7 +10246,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 460 + "__id__": 468 }, "_contentSize": { "__type__": "cc.Size", @@ -10161,7 +10274,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 462 + "__id__": 470 }, "_alignFlags": 45, "_target": null, @@ -10197,7 +10310,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 464 + "__id__": 472 }, "debugMode": false, "_id": "" @@ -10219,10 +10332,13 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 446 + "__id__": 454 }, { - "__id__": 437 + "__id__": 445 + }, + { + "__id__": 416 }, { "__id__": 55 diff --git a/assets/script/game/map/GuideComp.ts b/assets/script/game/map/GuideComp.ts index 123ccfde..03961636 100644 --- a/assets/script/game/map/GuideComp.ts +++ b/assets/script/game/map/GuideComp.ts @@ -3,9 +3,7 @@ import { mLogger } from "../common/Logger"; import { _decorator, Animation, AnimationClip, EventTouch, Label, Node, NodeEventType, Sprite, SpriteAtlas, Tween, tween, UIOpacity, Vec3, resources, Light, UITransform, Widget, CCInteger } from "cc"; import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS"; import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/module/common/CCComp"; - - - +import { smc } from "../common/SingletonModuleComp"; const { ccclass, property } = _decorator; @@ -20,18 +18,64 @@ export class GuideComp extends CCComp { /** 手势图标节点 */ @property(Node) hand: Node = null! - /** 手势图标节点 */ + + /** 引导编号 ID */ @property({ type: CCInteger }) guide_id: number = 0 onLoad() { - + // 如果该引导已经完成,则隐藏并销毁本节点 + if (smc.finish_guides.includes(this.guide_id)) { + this.node.active = false; + this.node.destroy(); + return; + } + // 监听手势节点点击事件 + if (this.hand) { + this.hand.on(NodeEventType.TOUCH_START, this.onTouchStart, this); + this.hand.on(NodeEventType.TOUCH_END, this.onGuideClick, this); + } else { + // 兜底:如果没有绑定手势节点,则监听自身节点 + this.node.on(NodeEventType.TOUCH_START, this.onTouchStart, this); + this.node.on(NodeEventType.TOUCH_END, this.onGuideClick, this); + } } + + private onTouchStart(event: EventTouch) { + // 允许事件穿透,确保底层的实际功能按钮能正常接收到 TOUCH_START 事件 + event.preventSwallow = true; + } + + private onGuideClick(event: EventTouch) { + // 记录该引导 ID 已完成 + if (!smc.finish_guides.includes(this.guide_id)) { + smc.finish_guides.push(this.guide_id); + mLogger.log(this.debugMode, 'Guide', `完成引导 ID: ${this.guide_id}`); + + // TODO: 若需要持久化保存,可在此处调用本地存储或同步到服务器的方法 + // oops.storage.set("finish_guides", smc.finish_guides); + } + + // 允许事件穿透,确保底层的实际功能按钮能正常接收到点击事件 + event.preventSwallow = true; + + // 完成后隐藏并销毁引导节点 + this.node.active = false; + this.node.destroy(); + } + /** 组件销毁时解绑所有事件,防止残留回调 */ onDestroy() { - + if (this.hand && this.hand.isValid) { + this.hand.off(NodeEventType.TOUCH_START, this.onTouchStart, this); + this.hand.off(NodeEventType.TOUCH_END, this.onGuideClick, this); + } + if (this.node && this.node.isValid) { + this.node.off(NodeEventType.TOUCH_START, this.onTouchStart, this); + this.node.off(NodeEventType.TOUCH_END, this.onGuideClick, this); + } } /** 外部初始化入口(由 MissionGuideComp 调用) */ @@ -39,9 +83,10 @@ export class GuideComp extends CCComp { } - /** ECS 组件移除时的释放钩子:销毁节点 */ reset() { - this.node.destroy(); + if (this.node && this.node.isValid) { + this.node.destroy(); + } } }