Commit f54bcee1 authored by 李维's avatar 李维

Merge branch 'master' of http://vcs.ireadabc.com/template/YM5-20

parents 7bb84882 dc93edaa
...@@ -389,6 +389,7 @@ export class PlayComponent implements OnInit, OnDestroy { ...@@ -389,6 +389,7 @@ export class PlayComponent implements OnInit, OnDestroy {
textMainContainer.ref.y = pos[len].textMain.y - 50; textMainContainer.ref.y = pos[len].textMain.y - 50;
let textLeftContainer = this.g_cartoon.createCartoonElementShapeRect(`popup-text-back-left-${i}-container`, 386, 100, "#FFFF00"); let textLeftContainer = this.g_cartoon.createCartoonElementShapeRect(`popup-text-back-left-${i}-container`, 386, 100, "#FFFF00");
let lettersSpecLeft = []
let lettersLeft = [] let lettersLeft = []
bgCard.ref.addChild(textLeftContainer.ref); bgCard.ref.addChild(textLeftContainer.ref);
textLeftContainer.ref.alpha = 0; textLeftContainer.ref.alpha = 0;
...@@ -399,15 +400,17 @@ export class PlayComponent implements OnInit, OnDestroy { ...@@ -399,15 +400,17 @@ export class PlayComponent implements OnInit, OnDestroy {
baseX += bd.width + 1 baseX += bd.width + 1
textLeftContainer.ref.addChild(letter); textLeftContainer.ref.addChild(letter);
if(dataItem.letters_left[wi].letter_color=="#c8161e") { if(dataItem.letters_left[wi].letter_color=="#c8161e") {
lettersLeft.push(letter) lettersSpecLeft.push(letter)
} }
lettersLeft.push(letter)
} }
textLeftContainer.ref.width = baseX; textLeftContainer.ref.width = baseX;
textLeftContainer.ref.x = pos[len].textLeft.x - baseX / 2; textLeftContainer.ref.x = pos[len].textLeft.x - baseX / 2;
textLeftContainer.ref.y = pos[len].textLeft.y - 50; textLeftContainer.ref.y = pos[len].textLeft.y - 50;
let textRightContainer = this.g_cartoon.createCartoonElementShapeRect(`popup-text-back-right-${i}-container`, 386, 100, "#FFFF00"); let textRightContainer = this.g_cartoon.createCartoonElementShapeRect(`popup-text-back-right-${i}-container`, 386, 100, "#FFFF00");
let lettersRight = [] let lettersSpecRight = []
let lettersRight = [];
bgCard.ref.addChild(textRightContainer.ref); bgCard.ref.addChild(textRightContainer.ref);
textRightContainer.ref.alpha = 0; textRightContainer.ref.alpha = 0;
baseX = 0; baseX = 0;
...@@ -417,8 +420,9 @@ export class PlayComponent implements OnInit, OnDestroy { ...@@ -417,8 +420,9 @@ export class PlayComponent implements OnInit, OnDestroy {
baseX += bd.width + 1 baseX += bd.width + 1
textRightContainer.ref.addChild(letter) textRightContainer.ref.addChild(letter)
if(dataItem.letters_right[wi].letter_color=="#c8161e") { if(dataItem.letters_right[wi].letter_color=="#c8161e") {
lettersRight.push(letter) lettersSpecRight.push(letter)
} }
lettersRight.push(letter)
} }
textRightContainer.ref.width = baseX; textRightContainer.ref.width = baseX;
textRightContainer.ref.x = pos[len].textRight.x - baseX / 2; textRightContainer.ref.x = pos[len].textRight.x - baseX / 2;
...@@ -562,9 +566,12 @@ export class PlayComponent implements OnInit, OnDestroy { ...@@ -562,9 +566,12 @@ export class PlayComponent implements OnInit, OnDestroy {
this.g_enableMapDown = true; this.g_enableMapDown = true;
}) })
circleRight.ref.alpha = 255; circleRight.ref.alpha = 255;
lettersRight.forEach(le=>{ lettersSpecRight.forEach(le=>{
le.fontColor = "#c8161e" le.fontColor = "#c8161e"
}) })
lettersRight.forEach(le=>{
le.fontSize = 48
})
bgCard.selected = true; bgCard.selected = true;
} else { } else {
this.g_cartoon.playAudio("sm-wrong", false, ()=>{ this.g_cartoon.playAudio("sm-wrong", false, ()=>{
...@@ -585,9 +592,12 @@ export class PlayComponent implements OnInit, OnDestroy { ...@@ -585,9 +592,12 @@ export class PlayComponent implements OnInit, OnDestroy {
this.g_enableMapDown = true; this.g_enableMapDown = true;
}) })
circleLeft.ref.alpha = 255; circleLeft.ref.alpha = 255;
lettersLeft.forEach(le=>{ lettersSpecLeft.forEach(le=>{
le.fontColor = "#c8161e" le.fontColor = "#c8161e"
}) })
lettersLeft.forEach(le=>{
le.fontSize = 48
})
bgCard.selected = true; bgCard.selected = true;
} else { } else {
this.g_cartoon.playAudio("sm-wrong", false, ()=>{ this.g_cartoon.playAudio("sm-wrong", false, ()=>{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment