diff --git a/form/src/app/form/form.component.html b/form/src/app/form/form.component.html index 67387c9954919fa4f7abb85252287f36f162c8d3..9f1c0aa8f20c35b4b0bc04c881420dc2dee33d69 100644 --- a/form/src/app/form/form.component.html +++ b/form/src/app/form/form.component.html @@ -45,42 +45,82 @@ <a (click)="addLetter('M')" style="font-size: 50px;">M </a> <br> </div> --> - <div class="border" style="width: 350px;"> - <span style="height: 30px; font-size: 18px;">å¯é€‰å—æ¯(ç‚¹å‡»ä¸‹æ–¹å—æ¯é€‰æ‹©):</span> - <br> - <a (click)="addLetter('A')" style="font-size: 50px;">A </a> - <a (click)="addLetter('B')" style="font-size: 50px;">B </a> - <a (click)="addLetter('C')" style="font-size: 50px;">C </a> - <a (click)="addLetter('D')" style="font-size: 50px;">D </a> - <a (click)="addLetter('E')" style="font-size: 50px;">E </a> - <a (click)="addLetter('F')" style="font-size: 50px;">F </a> - <a (click)="addLetter('G')" style="font-size: 50px;">G </a> - <br> - <a (click)="addLetter('H')" style="font-size: 50px;">H </a> - <a (click)="addLetter('I')" style="font-size: 50px;">I </a> - <a (click)="addLetter('J')" style="font-size: 50px;">J </a> - <a (click)="addLetter('K')" style="font-size: 50px;">K </a> - <a (click)="addLetter('L')" style="font-size: 50px;">L </a> - <a (click)="addLetter('M')" style="font-size: 50px;">M </a> - <a (click)="addLetter('N')" style="font-size: 50px;">N </a> - <br> - <a (click)="addLetter('O')" style="font-size: 50px;">O </a> - <a (click)="addLetter('P')" style="font-size: 50px;">P </a> - <a (click)="addLetter('Q')" style="font-size: 50px;">Q </a> - - <a (click)="addLetter('R')" style="font-size: 50px;">R </a> - <a (click)="addLetter('S')" style="font-size: 50px;">S </a> - <a (click)="addLetter('T')" style="font-size: 50px;">T </a> - <br> - <a (click)="addLetter('U')" style="font-size: 50px;">U </a> - <a (click)="addLetter('V')" style="font-size: 50px;">V </a> - <a (click)="addLetter('W')" style="font-size: 50px;">W </a> - - <a (click)="addLetter('X')" style="font-size: 50px;">X </a> - <a (click)="addLetter('Y')" style="font-size: 50px;">Y </a> - <a (click)="addLetter('Z')" style="font-size: 50px;">Z </a> - <br> + <div> + <div class="border" style="float: left; width: 350px;"> + <span style="height: 30px; font-size: 18px;">å¯é€‰å¤§å†™å—æ¯(ç‚¹å‡»ä¸‹æ–¹å—æ¯é€‰æ‹©):</span> + <br> + <a (click)="addLetter('A')" style="font-size: 50px;">A </a> + <a (click)="addLetter('B')" style="font-size: 50px;">B </a> + <a (click)="addLetter('C')" style="font-size: 50px;">C </a> + <a (click)="addLetter('D')" style="font-size: 50px;">D </a> + <a (click)="addLetter('E')" style="font-size: 50px;">E </a> + <a (click)="addLetter('F')" style="font-size: 50px;">F </a> + <a (click)="addLetter('G')" style="font-size: 50px;">G </a> + <br> + <a (click)="addLetter('H')" style="font-size: 50px;">H </a> + <a (click)="addLetter('I')" style="font-size: 50px;">I </a> + <a (click)="addLetter('J')" style="font-size: 50px;">J </a> + <a (click)="addLetter('K')" style="font-size: 50px;">K </a> + <a (click)="addLetter('L')" style="font-size: 50px;">L </a> + <a (click)="addLetter('M')" style="font-size: 50px;">M </a> + <a (click)="addLetter('N')" style="font-size: 50px;">N </a> + <br> + <a (click)="addLetter('O')" style="font-size: 50px;">O </a> + <a (click)="addLetter('P')" style="font-size: 50px;">P </a> + <a (click)="addLetter('Q')" style="font-size: 50px;">Q </a> + + <a (click)="addLetter('R')" style="font-size: 50px;">R </a> + <a (click)="addLetter('S')" style="font-size: 50px;">S </a> + <a (click)="addLetter('T')" style="font-size: 50px;">T </a> + <br> + <a (click)="addLetter('U')" style="font-size: 50px;">U </a> + <a (click)="addLetter('V')" style="font-size: 50px;">V </a> + <a (click)="addLetter('W')" style="font-size: 50px;">W </a> + + <a (click)="addLetter('X')" style="font-size: 50px;">X </a> + <a (click)="addLetter('Y')" style="font-size: 50px;">Y </a> + <a (click)="addLetter('Z')" style="font-size: 50px;">Z </a> + <br> + </div> + + <div class="border" style="float: left; width: 350px;"> + <span style="height: 30px; font-size: 18px;">å¯é€‰å°å†™å—æ¯(ç‚¹å‡»ä¸‹æ–¹å—æ¯é€‰æ‹©):</span> + <br> + <a (click)="addLetter('a')" style="font-size: 50px;">a </a> + <a (click)="addLetter('b')" style="font-size: 50px;">b </a> + <a (click)="addLetter('c')" style="font-size: 50px;">c </a> + <a (click)="addLetter('d')" style="font-size: 50px;">d </a> + <a (click)="addLetter('e')" style="font-size: 50px;">e </a> + <a (click)="addLetter('f')" style="font-size: 50px;">f </a> + <a (click)="addLetter('g')" style="font-size: 50px;">g </a> + <br> + <a (click)="addLetter('h')" style="font-size: 50px;">h </a> + <a (click)="addLetter('i')" style="font-size: 50px;">i </a> + <a (click)="addLetter('j')" style="font-size: 50px;">j </a> + <a (click)="addLetter('k')" style="font-size: 50px;">k </a> + <a (click)="addLetter('l')" style="font-size: 50px;">l </a> + <a (click)="addLetter('m')" style="font-size: 50px;">m </a> + <a (click)="addLetter('n')" style="font-size: 50px;">n </a> + <br> + <a (click)="addLetter('o')" style="font-size: 50px;">o </a> + <a (click)="addLetter('p')" style="font-size: 50px;">p </a> + <a (click)="addLetter('q')" style="font-size: 50px;">q </a> + + <a (click)="addLetter('r')" style="font-size: 50px;">r </a> + <a (click)="addLetter('s')" style="font-size: 50px;">s </a> + <a (click)="addLetter('t')" style="font-size: 50px;">t </a> + <br> + <a (click)="addLetter('u')" style="font-size: 50px;">u </a> + <a (click)="addLetter('v')" style="font-size: 50px;">v </a> + <a (click)="addLetter('w')" style="font-size: 50px;">w </a> + + <a (click)="addLetter('x')" style="font-size: 50px;">x </a> + <a (click)="addLetter('y')" style="font-size: 50px;">y </a> + <a (click)="addLetter('z')" style="font-size: 50px;">z </a> + <br> + </div> </div> + <!-- <div class="border" style=" width: 520px; height: 120px;"> <span style="height: 30px; font-size: 18px;">å•è¯éŸ³é¢‘:</span> <br> diff --git a/play/assets/tmpGame/scene/n_xuan1.js b/play/assets/tmpGame/scene/n_xuan1.js index 325408b2e07578b0bf25410cbd6cc217defafc6a..051dc63148c934ea3c72ce70de2a18d27786112d 100644 --- a/play/assets/tmpGame/scene/n_xuan1.js +++ b/play/assets/tmpGame/scene/n_xuan1.js @@ -460,14 +460,16 @@ cc.Class({ currentStrokeIdx: 0, currentStrokeStageIdx: 0 } - this.sharkNode.parent = null; - this.sharkNode = null; + if(this.sharkNode) { + this.sharkNode.parent = null; + this.sharkNode = null; + } this.updateLetter(); }, updateLetter() { this.letter = this.data.letterList[this._status.currentLetterIdx]; - this.letter = this.letter.toUpperCase(); + // this.letter = this.letter.toUpperCase(); this.createLetterPage(this.letter); this.updatePicturePage(); }, @@ -961,19 +963,25 @@ cc.Class({ await this.showCompleteStar(); this.playEffect(`letter${this.letter.toUpperCase()}`); // await this.showRibbons(); - await this.fireworks() - this.playEffect('撒花'); + if(this._status.currentLetterIdx != (this.data.letterList.length-1)) { + await this.fireworks() + this.playEffect('撒花'); + } await this.showCloud(); // console.log(this._status.currentLetterIdx, this.data.letterList.length-1) - if (this.letter !== this.letter.toLowerCase()) { - this.letter = this.letter.toLowerCase(); + // if (this.letter !== this.letter.toLowerCase()) { + // this.letter = this.letter.toLowerCase(); + // this.pageFlyOut(); + // this.createLetterPage(this.letter); + // } else { + // if(this._status.currentLetterIdx != (this.data.letterList.length-1)) { + // this.pageFlyOut(); + // this.loadNextLetter() + // } + // } + if(this._status.currentLetterIdx != (this.data.letterList.length-1)) { this.pageFlyOut(); - this.createLetterPage(this.letter); - } else { - if(this._status.currentLetterIdx != (this.data.letterList.length-1)) { - this.pageFlyOut(); - this.loadNextLetter() - } + this.loadNextLetter() } }, diff --git a/play/assets/tmpGame/script/defaultData.js b/play/assets/tmpGame/script/defaultData.js index c0d292c9952dccd71b5c8ed87edbce0ff016b396..e07b87c03b19ef7586aa7aeba40933de0cb5d4b8 100644 --- a/play/assets/tmpGame/script/defaultData.js +++ b/play/assets/tmpGame/script/defaultData.js @@ -1,5 +1,3 @@ module.exports = { - letterList: [ - 'g', 'u', 'x' - ] + letterList: ["A", "a", "B", "C", "d"] }