diff --git a/assets/Game/Scripts/Icon.ts b/assets/Game/Scripts/Icon.ts index 5b25190..bf73642 100644 --- a/assets/Game/Scripts/Icon.ts +++ b/assets/Game/Scripts/Icon.ts @@ -128,6 +128,10 @@ export class Icon extends Component { this.normalNode.active = false; this.spineNode.active = true; spine.setAnimation(0, 'idle', true); + } else if (this.index == 0) { + this.normalNode.active = false; + this.spineNode.active = true; + spine.setAnimation(0, 'chixu', true); } else { this.normalNode.active = true; this.spineNode.active = false; @@ -211,8 +215,10 @@ export class Icon extends Component { if (bol) { this.normalNode.active = false; this.spineNode.active = true; - spine.setAnimation(0, 'denggai', true); + spine.timeScale = 0.3 + spine.setAnimation(0, 'denggai', false); } else { + spine.timeScale = 1 this.playIdleSpine(true); } } diff --git a/assets/Game/Scripts/UpLayer.ts b/assets/Game/Scripts/UpLayer.ts index 2f8f1b6..042fc0f 100644 --- a/assets/Game/Scripts/UpLayer.ts +++ b/assets/Game/Scripts/UpLayer.ts @@ -132,12 +132,11 @@ export class UpLayer extends Component { seen.add(n); let icon = n.getComponent(Icon); - if (!icon || !icon.isWildOrScatter) continue; + if (!icon || !icon.isScatter) continue; let msg = (roller as any).getNodeMsgFromPos(i); if (!msg) continue; - - let type: 'Multi' | 'scatter' = icon.index === 0 ? 'Multi' : 'scatter'; + let type: 'Multi' | 'scatter' = 'scatter'; this.adoptSpecial(msg.node, roller.rollerId, msg.start, msg.height, type); } } @@ -173,7 +172,6 @@ export class UpLayer extends Component { playScatterWaitSpine(bol: boolean) { - console.log('播放scatter等待动画2', this.scatterLayer); this.scatterLayer.children.forEach(child => child.getComponent(Icon).playScatterWaitSpine(bol)); } }