mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2025-09-23 15:03:24 +02:00
Merge branch 'hotfix-1.10.7' into change-touch-inputs
This commit is contained in:
commit
f86eb962c4
@ -230,6 +230,7 @@ export class EggHatchPhase extends Phase {
|
|||||||
} else {
|
} else {
|
||||||
globalScene.time.delayedCall(250, () => globalScene.setModifiersVisible(true));
|
globalScene.time.delayedCall(250, () => globalScene.setModifiersVisible(true));
|
||||||
}
|
}
|
||||||
|
this.pokemon?.destroy();
|
||||||
super.end();
|
super.end();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -39,6 +39,10 @@ export class EggSummaryPhase extends Phase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
end() {
|
end() {
|
||||||
|
this.eggHatchData.forEach(data => {
|
||||||
|
data.pokemon?.destroy();
|
||||||
|
});
|
||||||
|
this.eggHatchData = [];
|
||||||
globalScene.time.delayedCall(250, () => globalScene.setModifiersVisible(true));
|
globalScene.time.delayedCall(250, () => globalScene.setModifiersVisible(true));
|
||||||
globalScene.ui.setModeForceTransition(UiMode.MESSAGE).then(() => {
|
globalScene.ui.setModeForceTransition(UiMode.MESSAGE).then(() => {
|
||||||
super.end();
|
super.end();
|
||||||
|
Loading…
Reference in New Issue
Block a user