From 763d327625a5fad80e8f3c12943e81eff5bbd848 Mon Sep 17 00:00:00 2001 From: walkpan Date: Thu, 21 Nov 2024 18:16:44 +0800 Subject: [PATCH] mission_end --- assets/resources/gui/role_controller.prefab | 1354 ++++++------------- assets/script/game/hero/HeroViewComp.ts | 4 +- assets/script/game/map/MIssionController.ts | 21 +- assets/script/game/map/VictoryComp.ts | 30 +- assets/script/game/skills/MSkillComp.ts | 1 - 5 files changed, 399 insertions(+), 1011 deletions(-) diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index cf0e4fd6..961d16ad 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -40,44 +40,41 @@ "__id__": 272 }, { - "__id__": 569 + "__id__": 578 }, { - "__id__": 621 + "__id__": 604 }, { - "__id__": 630 + "__id__": 613 }, { - "__id__": 639 + "__id__": 622 }, { - "__id__": 643 + "__id__": 626 }, { - "__id__": 653 + "__id__": 636 }, { - "__id__": 742 - }, - { - "__id__": 751 + "__id__": 725 } ], "_active": true, "_components": [ { - "__id__": 757 + "__id__": 731 }, { - "__id__": 759 + "__id__": 733 }, { - "__id__": 761 + "__id__": 735 } ], "_prefab": { - "__id__": 763 + "__id__": 737 }, "_lpos": { "__type__": "cc.Vec3", @@ -5351,7 +5348,7 @@ ], "value": { "__type__": "cc.Vec3", - "x": 360, + "x": 0, "y": 640, "z": 0 } @@ -5543,22 +5540,25 @@ }, { "__id__": 552 + }, + { + "__id__": 562 } ], "_active": true, "_components": [ { - "__id__": 562 + "__id__": 571 }, { - "__id__": 564 + "__id__": 573 }, { - "__id__": 566 + "__id__": 575 } ], "_prefab": { - "__id__": 568 + "__id__": 577 }, "_lpos": { "__type__": "cc.Vec3", @@ -11671,6 +11671,131 @@ "27AflFJ+VOkLtmChlMSsIV" ] }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 272 + }, + "_prefab": { + "__id__": 563 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 562 + }, + "asset": { + "__uuid__": "9260d2d2-4104-4b8f-beb7-ab74b894b73b", + "__expectedType__": "cc.Prefab" + }, + "fileId": "1el6EAJ9JL9ruo0tKeStck", + "instance": { + "__id__": 564 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "bds7nmfxhPn4e4kkILZ68p", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 565 + }, + { + "__id__": 567 + }, + { + "__id__": 568 + }, + { + "__id__": 569 + }, + { + "__id__": 570 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 566 + }, + "propertyPath": [ + "_name" + ], + "value": "victory" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "1el6EAJ9JL9ruo0tKeStck" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 566 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 640, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 566 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 566 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 566 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, { "__type__": "cc.UITransform", "_name": "", @@ -11681,7 +11806,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 563 + "__id__": 572 }, "_contentSize": { "__type__": "cc.Size", @@ -11709,7 +11834,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 565 + "__id__": 574 }, "_alignFlags": 16, "_target": null, @@ -11745,7 +11870,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 567 + "__id__": 576 }, "_id": "" }, @@ -11776,20 +11901,20 @@ }, "_children": [ { - "__id__": 570 + "__id__": 579 } ], "_active": true, "_components": [ { - "__id__": 616 + "__id__": 599 }, { - "__id__": 618 + "__id__": 601 } ], "_prefab": { - "__id__": 620 + "__id__": 603 }, "_lpos": { "__type__": "cc.Vec3", @@ -11822,37 +11947,31 @@ }, { "__type__": "cc.Node", - "_name": "calls", + "_name": "start", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 569 + "__id__": 578 }, "_children": [ { - "__id__": 571 + "__id__": 580 }, { - "__id__": 591 - }, - { - "__id__": 597 - }, - { - "__id__": 603 + "__id__": 586 } ], "_active": true, "_components": [ { - "__id__": 611 + "__id__": 592 }, { - "__id__": 613 + "__id__": 594 } ], "_prefab": { - "__id__": 615 + "__id__": 598 }, "_lpos": { "__type__": "cc.Vec3", @@ -11885,81 +12004,24 @@ }, { "__type__": "cc.Node", - "_name": "start", + "_name": "btn", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 570 - }, - "_children": [ - { - "__id__": 572 - }, - { - "__id__": 578 - } - ], - "_active": true, - "_components": [ - { - "__id__": 584 - }, - { - "__id__": 586 - } - ], - "_prefab": { - "__id__": 590 - }, - "_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.Node", - "_name": "BubbleFrame01_Hexagon_Bg_Blue", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 571 + "__id__": 579 }, "_children": [], "_active": true, "_components": [ { - "__id__": 573 + "__id__": 581 }, { - "__id__": 575 + "__id__": 583 } ], "_prefab": { - "__id__": 577 + "__id__": 585 }, "_lpos": { "__type__": "cc.Vec3", @@ -11996,11 +12058,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 572 + "__id__": 580 }, "_enabled": true, "__prefab": { - "__id__": 574 + "__id__": 582 }, "_contentSize": { "__type__": "cc.Size", @@ -12024,11 +12086,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 572 + "__id__": 580 }, "_enabled": true, "__prefab": { - "__id__": 576 + "__id__": 584 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12082,20 +12144,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 571 + "__id__": 579 }, "_children": [], "_active": true, "_components": [ { - "__id__": 579 + "__id__": 587 }, { - "__id__": 581 + "__id__": 589 } ], "_prefab": { - "__id__": 583 + "__id__": 591 }, "_lpos": { "__type__": "cc.Vec3", @@ -12132,11 +12194,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 578 + "__id__": 586 }, "_enabled": true, "__prefab": { - "__id__": 580 + "__id__": 588 }, "_contentSize": { "__type__": "cc.Size", @@ -12160,11 +12222,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 578 + "__id__": 586 }, "_enabled": true, "__prefab": { - "__id__": 582 + "__id__": 590 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12241,11 +12303,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 571 + "__id__": 579 }, "_enabled": true, "__prefab": { - "__id__": 585 + "__id__": 593 }, "_contentSize": { "__type__": "cc.Size", @@ -12269,18 +12331,18 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 571 + "__id__": 579 }, "_enabled": true, "__prefab": { - "__id__": 587 + "__id__": 595 }, "clickEvents": [ { - "__id__": 588 + "__id__": 596 }, { - "__id__": 589 + "__id__": 597 } ], "_interactable": true, @@ -12320,7 +12382,7 @@ "_duration": 0.1, "_zoomScale": 0.8, "_target": { - "__id__": 571 + "__id__": 579 }, "_id": "" }, @@ -12361,550 +12423,17 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, - { - "__type__": "cc.Node", - "_name": "line_bg", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 570 - }, - "_children": [], - "_active": false, - "_components": [ - { - "__id__": 592 - }, - { - "__id__": 594 - } - ], - "_prefab": { - "__id__": 596 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 37.996, - "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__": 591 + "__id__": 578 }, "_enabled": true, "__prefab": { - "__id__": 593 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 80, - "height": 25 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "afxbSbOY5GD5pj/5Zul1tP" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 591 - }, - "_enabled": true, - "__prefab": { - "__id__": 595 - }, - "_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@5304c", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_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": "6epLcdHBxAh7FD9EeBaeRY" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "02kt0GpMVHvJywiO33YWi6", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "ItemIcon_Skull", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 570 - }, - "_children": [], - "_active": false, - "_components": [ - { - "__id__": 598 - }, - { - "__id__": 600 - } - ], - "_prefab": { - "__id__": 602 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": -30.997, - "y": 37.63, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 0.3, - "y": 0.3, - "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__": 597 - }, - "_enabled": true, - "__prefab": { - "__id__": 599 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 126, - "height": 102 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23bCs21ZxA7q1F26gLmDvL" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 597 - }, - "_enabled": true, - "__prefab": { - "__id__": 601 - }, - "_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@2d3d8", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 1, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "eflvr+RDxGM61lbdu+NrJp" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "6e0WSYdJJKELq/EWv2DAK8", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "level", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 570 - }, - "_children": [], - "_active": false, - "_components": [ - { - "__id__": 604 - }, - { - "__id__": 606 - }, - { - "__id__": 608 - } - ], - "_prefab": { - "__id__": 610 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 10.92, - "y": 38.813, - "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__": 603 - }, - "_enabled": true, - "__prefab": { - "__id__": 605 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 15.123046875, - "height": 54.4 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "6eVHFPF1pKjLWYOPjF+pZM" - }, - { - "__type__": "cc.Label", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 603 - }, - "_enabled": true, - "__prefab": { - "__id__": 607 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_string": "9", - "_horizontalAlign": 1, - "_verticalAlign": 1, - "_actualFontSize": 20, - "_fontSize": 20, - "_fontFamily": "Arial", - "_lineHeight": 40, - "_overflow": 0, - "_enableWrapText": true, - "_font": null, - "_isSystemFontUsed": true, - "_spacingX": 0, - "_isItalic": false, - "_isBold": false, - "_isUnderline": false, - "_underlineHeight": 2, - "_cacheMode": 0, - "_enableOutline": true, - "_outlineColor": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_outlineWidth": 2, - "_enableShadow": false, - "_shadowColor": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_shadowOffset": { - "__type__": "cc.Vec2", - "x": 2, - "y": 2 - }, - "_shadowBlur": 2, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "4e91chex9N267vqwtCRMux" - }, - { - "__type__": "545c05XsG9GDJispEGWKvYv", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 603 - }, - "_enabled": true, - "__prefab": { - "__id__": 609 - }, - "templateMode": false, - "watchPath": "data.role.mission", - "labelType": "cc.Label", - "watchPathArr": [], - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "07dfibQzRCYr583AuknaE9" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "39xD+53ZhA9qN+Zrg7oozS", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 570 - }, - "_enabled": true, - "__prefab": { - "__id__": 612 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 100, - "height": 100 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "6agdg4R0tDNYMPxj/aPnDF" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 570 - }, - "_enabled": true, - "__prefab": { - "__id__": 614 - }, - "_alignFlags": 16, - "_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": "90hyARN4hJ5Z09Au5VPB48" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "76OwzrKaNCT5k80KpdCrAR", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 569 - }, - "_enabled": true, - "__prefab": { - "__id__": 617 + "__id__": 600 }, "_contentSize": { "__type__": "cc.Size", @@ -12928,11 +12457,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 569 + "__id__": 578 }, "_enabled": true, "__prefab": { - "__id__": 619 + "__id__": 602 }, "_alignFlags": 16, "_target": null, @@ -12978,14 +12507,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 622 + "__id__": 605 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 621 + "__id__": 604 }, "asset": { "__uuid__": "5423b9f8-8a8a-49a0-8ecb-0489dfcaba92", @@ -12993,7 +12522,7 @@ }, "fileId": "913f5QU7JKAZE87n6c4hSI", "instance": { - "__id__": 623 + "__id__": 606 }, "targetOverrides": null }, @@ -13007,19 +12536,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 624 + "__id__": 607 }, { - "__id__": 626 + "__id__": 609 }, { - "__id__": 627 + "__id__": 610 }, { - "__id__": 628 + "__id__": 611 }, { - "__id__": 629 + "__id__": 612 } ], "removedComponents": [] @@ -13027,7 +12556,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 625 + "__id__": 608 }, "propertyPath": [ "_name" @@ -13043,7 +12572,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 625 + "__id__": 608 }, "propertyPath": [ "_lpos" @@ -13058,7 +12587,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 625 + "__id__": 608 }, "propertyPath": [ "_lrot" @@ -13074,7 +12603,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 625 + "__id__": 608 }, "propertyPath": [ "_euler" @@ -13089,7 +12618,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 625 + "__id__": 608 }, "propertyPath": [ "_active" @@ -13103,14 +12632,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 631 + "__id__": 614 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 630 + "__id__": 613 }, "asset": { "__uuid__": "a14709ee-4775-4141-ae49-9f1f4a2b91b8", @@ -13118,7 +12647,7 @@ }, "fileId": "a2Mppj56hC3rhWLN9lYFwN", "instance": { - "__id__": 632 + "__id__": 615 }, "targetOverrides": null }, @@ -13132,19 +12661,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 633 + "__id__": 616 }, { - "__id__": 635 + "__id__": 618 }, { - "__id__": 636 + "__id__": 619 }, { - "__id__": 637 + "__id__": 620 }, { - "__id__": 638 + "__id__": 621 } ], "removedComponents": [] @@ -13152,7 +12681,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 634 + "__id__": 617 }, "propertyPath": [ "_name" @@ -13168,7 +12697,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 634 + "__id__": 617 }, "propertyPath": [ "_lpos" @@ -13183,7 +12712,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 634 + "__id__": 617 }, "propertyPath": [ "_lrot" @@ -13199,7 +12728,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 634 + "__id__": 617 }, "propertyPath": [ "_euler" @@ -13214,7 +12743,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 634 + "__id__": 617 }, "propertyPath": [ "_active" @@ -13233,11 +12762,11 @@ "_active": true, "_components": [ { - "__id__": 640 + "__id__": 623 } ], "_prefab": { - "__id__": 642 + "__id__": 625 }, "_lpos": { "__type__": "cc.Vec3", @@ -13274,11 +12803,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 639 + "__id__": 622 }, "_enabled": true, "__prefab": { - "__id__": 641 + "__id__": 624 }, "_contentSize": { "__type__": "cc.Size", @@ -13316,14 +12845,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 644 + "__id__": 627 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 643 + "__id__": 626 }, "asset": { "__uuid__": "dc0b56d7-c633-4cd2-a6ff-8fa2d7456d9d", @@ -13331,7 +12860,7 @@ }, "fileId": "5bChJGE9BD55+nIimwyIR0", "instance": { - "__id__": 645 + "__id__": 628 }, "targetOverrides": null }, @@ -13345,19 +12874,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 646 + "__id__": 629 }, { - "__id__": 648 + "__id__": 631 }, { - "__id__": 649 + "__id__": 632 }, { - "__id__": 650 + "__id__": 633 }, { - "__id__": 651 + "__id__": 634 } ], "removedComponents": [] @@ -13365,7 +12894,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 647 + "__id__": 630 }, "propertyPath": [ "_name" @@ -13381,7 +12910,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 647 + "__id__": 630 }, "propertyPath": [ "_lpos" @@ -13396,7 +12925,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 647 + "__id__": 630 }, "propertyPath": [ "_lrot" @@ -13412,7 +12941,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 647 + "__id__": 630 }, "propertyPath": [ "_euler" @@ -13427,7 +12956,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 652 + "__id__": 635 }, "propertyPath": [ "_active" @@ -13450,32 +12979,32 @@ }, "_children": [ { - "__id__": 654 + "__id__": 637 }, { - "__id__": 660 + "__id__": 643 }, { - "__id__": 685 + "__id__": 668 }, { - "__id__": 710 + "__id__": 693 } ], "_active": true, "_components": [ { - "__id__": 735 + "__id__": 718 }, { - "__id__": 737 + "__id__": 720 }, { - "__id__": 739 + "__id__": 722 } ], "_prefab": { - "__id__": 741 + "__id__": 724 }, "_lpos": { "__type__": "cc.Vec3", @@ -13512,20 +13041,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 653 + "__id__": 636 }, "_children": [], "_active": true, "_components": [ { - "__id__": 655 + "__id__": 638 }, { - "__id__": 657 + "__id__": 640 } ], "_prefab": { - "__id__": 659 + "__id__": 642 }, "_lpos": { "__type__": "cc.Vec3", @@ -13562,11 +13091,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 654 + "__id__": 637 }, "_enabled": true, "__prefab": { - "__id__": 656 + "__id__": 639 }, "_contentSize": { "__type__": "cc.Size", @@ -13590,11 +13119,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 654 + "__id__": 637 }, "_enabled": true, "__prefab": { - "__id__": 658 + "__id__": 641 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13648,30 +13177,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 653 + "__id__": 636 }, "_children": [ { - "__id__": 661 + "__id__": 644 }, { - "__id__": 667 + "__id__": 650 }, { - "__id__": 673 + "__id__": 656 } ], "_active": true, "_components": [ { - "__id__": 679 + "__id__": 662 }, { - "__id__": 681 + "__id__": 664 } ], "_prefab": { - "__id__": 684 + "__id__": 667 }, "_lpos": { "__type__": "cc.Vec3", @@ -13708,20 +13237,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 660 + "__id__": 643 }, "_children": [], "_active": true, "_components": [ { - "__id__": 662 + "__id__": 645 }, { - "__id__": 664 + "__id__": 647 } ], "_prefab": { - "__id__": 666 + "__id__": 649 }, "_lpos": { "__type__": "cc.Vec3", @@ -13758,11 +13287,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 661 + "__id__": 644 }, "_enabled": true, "__prefab": { - "__id__": 663 + "__id__": 646 }, "_contentSize": { "__type__": "cc.Size", @@ -13786,11 +13315,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 661 + "__id__": 644 }, "_enabled": true, "__prefab": { - "__id__": 665 + "__id__": 648 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13844,20 +13373,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 660 + "__id__": 643 }, "_children": [], "_active": true, "_components": [ { - "__id__": 668 + "__id__": 651 }, { - "__id__": 670 + "__id__": 653 } ], "_prefab": { - "__id__": 672 + "__id__": 655 }, "_lpos": { "__type__": "cc.Vec3", @@ -13894,11 +13423,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 667 + "__id__": 650 }, "_enabled": true, "__prefab": { - "__id__": 669 + "__id__": 652 }, "_contentSize": { "__type__": "cc.Size", @@ -13922,11 +13451,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 667 + "__id__": 650 }, "_enabled": true, "__prefab": { - "__id__": 671 + "__id__": 654 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13980,20 +13509,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 660 + "__id__": 643 }, "_children": [], "_active": true, "_components": [ { - "__id__": 674 + "__id__": 657 }, { - "__id__": 676 + "__id__": 659 } ], "_prefab": { - "__id__": 678 + "__id__": 661 }, "_lpos": { "__type__": "cc.Vec3", @@ -14030,11 +13559,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 673 + "__id__": 656 }, "_enabled": true, "__prefab": { - "__id__": 675 + "__id__": 658 }, "_contentSize": { "__type__": "cc.Size", @@ -14058,11 +13587,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 673 + "__id__": 656 }, "_enabled": true, "__prefab": { - "__id__": 677 + "__id__": 660 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14139,11 +13668,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 660 + "__id__": 643 }, "_enabled": true, "__prefab": { - "__id__": 680 + "__id__": 663 }, "_contentSize": { "__type__": "cc.Size", @@ -14167,15 +13696,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 660 + "__id__": 643 }, "_enabled": true, "__prefab": { - "__id__": 682 + "__id__": 665 }, "clickEvents": [ { - "__id__": 683 + "__id__": 666 } ], "_interactable": true, @@ -14250,30 +13779,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 653 + "__id__": 636 }, "_children": [ { - "__id__": 686 + "__id__": 669 }, { - "__id__": 692 + "__id__": 675 }, { - "__id__": 698 + "__id__": 681 } ], "_active": true, "_components": [ { - "__id__": 704 + "__id__": 687 }, { - "__id__": 706 + "__id__": 689 } ], "_prefab": { - "__id__": 709 + "__id__": 692 }, "_lpos": { "__type__": "cc.Vec3", @@ -14310,20 +13839,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 685 + "__id__": 668 }, "_children": [], "_active": false, "_components": [ { - "__id__": 687 + "__id__": 670 }, { - "__id__": 689 + "__id__": 672 } ], "_prefab": { - "__id__": 691 + "__id__": 674 }, "_lpos": { "__type__": "cc.Vec3", @@ -14360,11 +13889,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 686 + "__id__": 669 }, "_enabled": true, "__prefab": { - "__id__": 688 + "__id__": 671 }, "_contentSize": { "__type__": "cc.Size", @@ -14388,11 +13917,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 686 + "__id__": 669 }, "_enabled": true, "__prefab": { - "__id__": 690 + "__id__": 673 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14446,20 +13975,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 685 + "__id__": 668 }, "_children": [], "_active": true, "_components": [ { - "__id__": 693 + "__id__": 676 }, { - "__id__": 695 + "__id__": 678 } ], "_prefab": { - "__id__": 697 + "__id__": 680 }, "_lpos": { "__type__": "cc.Vec3", @@ -14496,11 +14025,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 692 + "__id__": 675 }, "_enabled": true, "__prefab": { - "__id__": 694 + "__id__": 677 }, "_contentSize": { "__type__": "cc.Size", @@ -14524,11 +14053,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 692 + "__id__": 675 }, "_enabled": true, "__prefab": { - "__id__": 696 + "__id__": 679 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14582,20 +14111,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 685 + "__id__": 668 }, "_children": [], "_active": true, "_components": [ { - "__id__": 699 + "__id__": 682 }, { - "__id__": 701 + "__id__": 684 } ], "_prefab": { - "__id__": 703 + "__id__": 686 }, "_lpos": { "__type__": "cc.Vec3", @@ -14632,11 +14161,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 698 + "__id__": 681 }, "_enabled": true, "__prefab": { - "__id__": 700 + "__id__": 683 }, "_contentSize": { "__type__": "cc.Size", @@ -14660,11 +14189,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 698 + "__id__": 681 }, "_enabled": true, "__prefab": { - "__id__": 702 + "__id__": 685 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14741,11 +14270,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 685 + "__id__": 668 }, "_enabled": true, "__prefab": { - "__id__": 705 + "__id__": 688 }, "_contentSize": { "__type__": "cc.Size", @@ -14769,15 +14298,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 685 + "__id__": 668 }, "_enabled": true, "__prefab": { - "__id__": 707 + "__id__": 690 }, "clickEvents": [ { - "__id__": 708 + "__id__": 691 } ], "_interactable": true, @@ -14852,30 +14381,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 653 + "__id__": 636 }, "_children": [ { - "__id__": 711 + "__id__": 694 }, { - "__id__": 717 + "__id__": 700 }, { - "__id__": 723 + "__id__": 706 } ], "_active": true, "_components": [ { - "__id__": 729 + "__id__": 712 }, { - "__id__": 731 + "__id__": 714 } ], "_prefab": { - "__id__": 734 + "__id__": 717 }, "_lpos": { "__type__": "cc.Vec3", @@ -14912,20 +14441,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 710 + "__id__": 693 }, "_children": [], "_active": false, "_components": [ { - "__id__": 712 + "__id__": 695 }, { - "__id__": 714 + "__id__": 697 } ], "_prefab": { - "__id__": 716 + "__id__": 699 }, "_lpos": { "__type__": "cc.Vec3", @@ -14962,11 +14491,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 711 + "__id__": 694 }, "_enabled": true, "__prefab": { - "__id__": 713 + "__id__": 696 }, "_contentSize": { "__type__": "cc.Size", @@ -14990,11 +14519,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 711 + "__id__": 694 }, "_enabled": true, "__prefab": { - "__id__": 715 + "__id__": 698 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15048,20 +14577,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 710 + "__id__": 693 }, "_children": [], "_active": true, "_components": [ { - "__id__": 718 + "__id__": 701 }, { - "__id__": 720 + "__id__": 703 } ], "_prefab": { - "__id__": 722 + "__id__": 705 }, "_lpos": { "__type__": "cc.Vec3", @@ -15098,11 +14627,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 717 + "__id__": 700 }, "_enabled": true, "__prefab": { - "__id__": 719 + "__id__": 702 }, "_contentSize": { "__type__": "cc.Size", @@ -15126,11 +14655,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 717 + "__id__": 700 }, "_enabled": true, "__prefab": { - "__id__": 721 + "__id__": 704 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15184,20 +14713,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 710 + "__id__": 693 }, "_children": [], "_active": true, "_components": [ { - "__id__": 724 + "__id__": 707 }, { - "__id__": 726 + "__id__": 709 } ], "_prefab": { - "__id__": 728 + "__id__": 711 }, "_lpos": { "__type__": "cc.Vec3", @@ -15234,11 +14763,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 723 + "__id__": 706 }, "_enabled": true, "__prefab": { - "__id__": 725 + "__id__": 708 }, "_contentSize": { "__type__": "cc.Size", @@ -15262,11 +14791,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 723 + "__id__": 706 }, "_enabled": true, "__prefab": { - "__id__": 727 + "__id__": 710 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15343,11 +14872,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 710 + "__id__": 693 }, "_enabled": true, "__prefab": { - "__id__": 730 + "__id__": 713 }, "_contentSize": { "__type__": "cc.Size", @@ -15371,15 +14900,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 710 + "__id__": 693 }, "_enabled": true, "__prefab": { - "__id__": 732 + "__id__": 715 }, "clickEvents": [ { - "__id__": 733 + "__id__": 716 } ], "_interactable": true, @@ -15454,11 +14983,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 653 + "__id__": 636 }, "_enabled": true, "__prefab": { - "__id__": 736 + "__id__": 719 }, "_contentSize": { "__type__": "cc.Size", @@ -15482,11 +15011,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 653 + "__id__": 636 }, "_enabled": true, "__prefab": { - "__id__": 738 + "__id__": 721 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15524,11 +15053,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 653 + "__id__": 636 }, "_enabled": true, "__prefab": { - "__id__": 740 + "__id__": 723 }, "_alignFlags": 20, "_target": null, @@ -15567,131 +15096,6 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 743 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 742 - }, - "asset": { - "__uuid__": "9260d2d2-4104-4b8f-beb7-ab74b894b73b", - "__expectedType__": "cc.Prefab" - }, - "fileId": "1el6EAJ9JL9ruo0tKeStck", - "instance": { - "__id__": 744 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "bds7nmfxhPn4e4kkILZ68p", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 745 - }, - { - "__id__": 747 - }, - { - "__id__": 748 - }, - { - "__id__": 749 - }, - { - "__id__": 750 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 746 - }, - "propertyPath": [ - "_name" - ], - "value": "victory" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "1el6EAJ9JL9ruo0tKeStck" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 746 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 640, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 746 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 746 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 746 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, { "__type__": "cc.Node", "_name": "front", @@ -15704,14 +15108,14 @@ "_active": true, "_components": [ { - "__id__": 752 + "__id__": 726 }, { - "__id__": 754 + "__id__": 728 } ], "_prefab": { - "__id__": 756 + "__id__": 730 }, "_lpos": { "__type__": "cc.Vec3", @@ -15748,11 +15152,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 751 + "__id__": 725 }, "_enabled": true, "__prefab": { - "__id__": 753 + "__id__": 727 }, "_contentSize": { "__type__": "cc.Size", @@ -15776,11 +15180,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 751 + "__id__": 725 }, "_enabled": true, "__prefab": { - "__id__": 755 + "__id__": 729 }, "_alignFlags": 12, "_target": null, @@ -15829,7 +15233,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 758 + "__id__": 732 }, "_contentSize": { "__type__": "cc.Size", @@ -15857,7 +15261,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 760 + "__id__": 734 }, "_alignFlags": 45, "_target": null, @@ -15893,7 +15297,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 762 + "__id__": 736 }, "_id": "" }, @@ -15913,24 +15317,24 @@ "instance": null, "targetOverrides": [ { - "__id__": 764 + "__id__": 738 }, { - "__id__": 767 + "__id__": 741 } ], "nestedPrefabInstanceRoots": [ { - "__id__": 742 + "__id__": 626 }, { - "__id__": 643 + "__id__": 613 }, { - "__id__": 630 + "__id__": 604 }, { - "__id__": 621 + "__id__": 562 }, { "__id__": 552 @@ -15970,7 +15374,7 @@ "__id__": 64 }, "sourceInfo": { - "__id__": 765 + "__id__": 739 }, "propertyPath": [ "_target" @@ -15979,7 +15383,7 @@ "__id__": 64 }, "targetInfo": { - "__id__": 766 + "__id__": 740 } }, { @@ -16000,7 +15404,7 @@ "__id__": 64 }, "sourceInfo": { - "__id__": 768 + "__id__": 742 }, "propertyPath": [ "_target" @@ -16009,7 +15413,7 @@ "__id__": 64 }, "targetInfo": { - "__id__": 769 + "__id__": 743 } }, { diff --git a/assets/script/game/hero/HeroViewComp.ts b/assets/script/game/hero/HeroViewComp.ts index b5f9f618..0e93540a 100644 --- a/assets/script/game/hero/HeroViewComp.ts +++ b/assets/script/game/hero/HeroViewComp.ts @@ -207,7 +207,7 @@ export class HeroViewComp extends CCComp { onPostSolve (selfCollider: Collider2D, otherCollider: Collider2D) { } update(dt: number){ - if(!smc.vm_data.mission.play||smc.vm_data.pause||smc.vm_data.mission.is_victory||smc.vm_data.mission.is_defeat) return + if(!smc.vm_data.mission.play||smc.vm_data.pause) return if(this.is_dead) { if(!this.in_grave()) this.to_grave() return @@ -281,7 +281,7 @@ export class HeroViewComp extends CCComp { } } move(dt: number){ - if(this.stop_cd > 0){ + if(this.stop_cd > 0||smc.vm_data.mission.is_victory||smc.vm_data.mission.is_defeat){ this.status_change("idle") return } diff --git a/assets/script/game/map/MIssionController.ts b/assets/script/game/map/MIssionController.ts index 77b14fde..7d0fee9f 100644 --- a/assets/script/game/map/MIssionController.ts +++ b/assets/script/game/map/MIssionController.ts @@ -26,13 +26,15 @@ import { HCard } from "./HCard"; import { HCardComp } from "./HCardComp"; import { MSkill } from "../skills/MSkill"; import { MSkillComp } from "../skills/MSkillComp"; +import { VictoryComp } from "./VictoryComp"; const { ccclass, property } = _decorator; /** 视图层对象 */ @ccclass('MissionComp') @ecs.register('Mission', false) export class MissionComp extends CCComp { - + VictoryNode: any = null; + VictoryComp:any = null; mon_list:any = [] call_hero_timer: Timer = new Timer(0.3); target_timer: Timer = new Timer(0.1); @@ -56,7 +58,9 @@ export class MissionComp extends CCComp { } start() { - + this.VictoryNode=this.node.getChildByName("victory") + this.VictoryNode.active=false + this.VictoryComp=this.VictoryNode.getComponent(VictoryComp) } protected update(dt: number): void { @@ -66,7 +70,6 @@ export class MissionComp extends CCComp { if(this.fight_start){ this.check_mon_num() } - this.do_reward() this.count_hero_pos() this.count_mon_pos() this.check_exp() @@ -255,7 +258,7 @@ export class MissionComp extends CCComp { } do_reward(){ console.log("do_reward") - oops.message.dispatchEvent("do_reward"); + } check_mon_num(){ let mons:any = this.get_mons() @@ -274,7 +277,15 @@ export class MissionComp extends CCComp { } if (!m_alive) smc.vm_data.mission.is_victory = true if (!h_alive) smc.vm_data.mission.is_defeat = true - console.log("check_end m_alive: "+m_alive+" h_alive:"+h_alive+" victory:"+smc.vm_data.mission.is_victory+" defeat:"+smc.vm_data.mission.is_defeat) + this.to_end_mission() + } + to_end_mission(){ + if (smc.vm_data.mission.is_victory){ + this.VictoryNode.active=true + } + if (smc.vm_data.mission.is_defeat){ + this.VictoryNode.active=true + } } get_mons(){ return ecs.query(ecs.allOf(MonModelComp)); diff --git a/assets/script/game/map/VictoryComp.ts b/assets/script/game/map/VictoryComp.ts index b863403a..2f52b100 100644 --- a/assets/script/game/map/VictoryComp.ts +++ b/assets/script/game/map/VictoryComp.ts @@ -25,6 +25,7 @@ export class VictoryComp extends CCComp { // console.log("VictoryComp start") oops.message.on("minssion_victory", this.do_victiry, this); oops.message.on("minssion_defeat", this.do_defeat, this); + console.log("VictoryComp start") } private do_victiry() { smc.vm_data.mission.play=false @@ -53,36 +54,9 @@ export class VictoryComp extends CCComp { } end_mission(){ this.node.getChildByName("Node").active=false - smc.vm_data.role.gold += smc.vm_data.mission.reward_gold - smc.vm_data.role.exp += smc.vm_data.mission.reward_exp - console.log("end_mission",this.rerawd_item,smc.vm_data.role.exp) - // smc.vm_data.role.items[this.rerawd_item.uuid].num += this.reward_num - - smc.vm_data.mission.reward_gold=0 - smc.vm_data.mission.reward_exp=0 - this.empty_mission() - oops.message.dispatchEvent("to_mission") - console.log("end_mission",smc.vm_data.role.items) - } - empty_mission(){ - let monsters:any= ecs.query(ecs.allOf(MonViewComp)); - let heros:any= ecs.query(ecs.allOf(HeroViewComp)); - let roles:any= ecs.query(ecs.allOf(RoleViewComp)); - let boss:any= ecs.query(ecs.allOf(BossViewComp)); - for(let i=0;i