Commit 03cb4fd6 authored by 李维's avatar 李维

New feature

parent b6c2c85b
...@@ -45,42 +45,82 @@ ...@@ -45,42 +45,82 @@
<a (click)="addLetter('M')" style="font-size: 50px;">M&nbsp;</a> <a (click)="addLetter('M')" style="font-size: 50px;">M&nbsp;</a>
<br> <br>
</div> --> </div> -->
<div class="border" style="width: 350px;"> <div>
<span style="height: 30px; font-size: 18px;">可选字母(点击下方字母选择):</span> <div class="border" style="float: left; width: 350px;">
<br> <span style="height: 30px; font-size: 18px;">可选大写字母(点击下方字母选择):</span>
<a (click)="addLetter('A')" style="font-size: 50px;">A&nbsp;</a> <br>
<a (click)="addLetter('B')" style="font-size: 50px;">B&nbsp;</a> <a (click)="addLetter('A')" style="font-size: 50px;">A&nbsp;</a>
<a (click)="addLetter('C')" style="font-size: 50px;">C&nbsp;</a> <a (click)="addLetter('B')" style="font-size: 50px;">B&nbsp;</a>
<a (click)="addLetter('D')" style="font-size: 50px;">D&nbsp;</a> <a (click)="addLetter('C')" style="font-size: 50px;">C&nbsp;</a>
<a (click)="addLetter('E')" style="font-size: 50px;">E&nbsp;</a> <a (click)="addLetter('D')" style="font-size: 50px;">D&nbsp;</a>
<a (click)="addLetter('F')" style="font-size: 50px;">F&nbsp;</a> <a (click)="addLetter('E')" style="font-size: 50px;">E&nbsp;</a>
<a (click)="addLetter('G')" style="font-size: 50px;">G&nbsp;</a> <a (click)="addLetter('F')" style="font-size: 50px;">F&nbsp;</a>
<br> <a (click)="addLetter('G')" style="font-size: 50px;">G&nbsp;</a>
<a (click)="addLetter('H')" style="font-size: 50px;">H&nbsp;</a> <br>
<a (click)="addLetter('I')" style="font-size: 50px;">I&nbsp;</a> <a (click)="addLetter('H')" style="font-size: 50px;">H&nbsp;</a>
<a (click)="addLetter('J')" style="font-size: 50px;">J&nbsp;</a> <a (click)="addLetter('I')" style="font-size: 50px;">I&nbsp;</a>
<a (click)="addLetter('K')" style="font-size: 50px;">K&nbsp;</a> <a (click)="addLetter('J')" style="font-size: 50px;">J&nbsp;</a>
<a (click)="addLetter('L')" style="font-size: 50px;">L&nbsp;</a> <a (click)="addLetter('K')" style="font-size: 50px;">K&nbsp;</a>
<a (click)="addLetter('M')" style="font-size: 50px;">M&nbsp;</a> <a (click)="addLetter('L')" style="font-size: 50px;">L&nbsp;</a>
<a (click)="addLetter('N')" style="font-size: 50px;">N&nbsp;</a> <a (click)="addLetter('M')" style="font-size: 50px;">M&nbsp;</a>
<br> <a (click)="addLetter('N')" style="font-size: 50px;">N&nbsp;</a>
<a (click)="addLetter('O')" style="font-size: 50px;">O&nbsp;</a> <br>
<a (click)="addLetter('P')" style="font-size: 50px;">P&nbsp;</a> <a (click)="addLetter('O')" style="font-size: 50px;">O&nbsp;</a>
<a (click)="addLetter('Q')" style="font-size: 50px;">Q&nbsp;</a> <a (click)="addLetter('P')" style="font-size: 50px;">P&nbsp;</a>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <a (click)="addLetter('Q')" style="font-size: 50px;">Q&nbsp;</a>
<a (click)="addLetter('R')" style="font-size: 50px;">R&nbsp;</a> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<a (click)="addLetter('S')" style="font-size: 50px;">S&nbsp;</a> <a (click)="addLetter('R')" style="font-size: 50px;">R&nbsp;</a>
<a (click)="addLetter('T')" style="font-size: 50px;">T&nbsp;</a> <a (click)="addLetter('S')" style="font-size: 50px;">S&nbsp;</a>
<br> <a (click)="addLetter('T')" style="font-size: 50px;">T&nbsp;</a>
<a (click)="addLetter('U')" style="font-size: 50px;">U&nbsp;</a> <br>
<a (click)="addLetter('V')" style="font-size: 50px;">V&nbsp;</a> <a (click)="addLetter('U')" style="font-size: 50px;">U&nbsp;</a>
<a (click)="addLetter('W')" style="font-size: 50px;">W&nbsp;</a> <a (click)="addLetter('V')" style="font-size: 50px;">V&nbsp;</a>
&nbsp;&nbsp; <a (click)="addLetter('W')" style="font-size: 50px;">W&nbsp;</a>
<a (click)="addLetter('X')" style="font-size: 50px;">X&nbsp;</a> &nbsp;&nbsp;
<a (click)="addLetter('Y')" style="font-size: 50px;">Y&nbsp;</a> <a (click)="addLetter('X')" style="font-size: 50px;">X&nbsp;</a>
<a (click)="addLetter('Z')" style="font-size: 50px;">Z&nbsp;</a> <a (click)="addLetter('Y')" style="font-size: 50px;">Y&nbsp;</a>
<br> <a (click)="addLetter('Z')" style="font-size: 50px;">Z&nbsp;</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&nbsp;</a>
<a (click)="addLetter('b')" style="font-size: 50px;">b&nbsp;</a>
<a (click)="addLetter('c')" style="font-size: 50px;">c&nbsp;</a>
<a (click)="addLetter('d')" style="font-size: 50px;">d&nbsp;</a>
<a (click)="addLetter('e')" style="font-size: 50px;">e&nbsp;</a>
<a (click)="addLetter('f')" style="font-size: 50px;">f&nbsp;</a>
<a (click)="addLetter('g')" style="font-size: 50px;">g&nbsp;</a>
<br>
<a (click)="addLetter('h')" style="font-size: 50px;">h&nbsp;</a>
<a (click)="addLetter('i')" style="font-size: 50px;">i&nbsp;</a>
<a (click)="addLetter('j')" style="font-size: 50px;">j&nbsp;</a>
<a (click)="addLetter('k')" style="font-size: 50px;">k&nbsp;</a>
<a (click)="addLetter('l')" style="font-size: 50px;">l&nbsp;</a>
<a (click)="addLetter('m')" style="font-size: 50px;">m&nbsp;</a>
<a (click)="addLetter('n')" style="font-size: 50px;">n&nbsp;</a>
<br>
<a (click)="addLetter('o')" style="font-size: 50px;">o&nbsp;</a>
<a (click)="addLetter('p')" style="font-size: 50px;">p&nbsp;</a>
<a (click)="addLetter('q')" style="font-size: 50px;">q&nbsp;</a>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<a (click)="addLetter('r')" style="font-size: 50px;">r&nbsp;</a>
<a (click)="addLetter('s')" style="font-size: 50px;">s&nbsp;</a>
<a (click)="addLetter('t')" style="font-size: 50px;">t&nbsp;</a>
<br>
<a (click)="addLetter('u')" style="font-size: 50px;">u&nbsp;</a>
<a (click)="addLetter('v')" style="font-size: 50px;">v&nbsp;</a>
<a (click)="addLetter('w')" style="font-size: 50px;">w&nbsp;</a>
&nbsp;&nbsp;
<a (click)="addLetter('x')" style="font-size: 50px;">x&nbsp;</a>
<a (click)="addLetter('y')" style="font-size: 50px;">y&nbsp;</a>
<a (click)="addLetter('z')" style="font-size: 50px;">z&nbsp;</a>
<br>
</div>
</div> </div>
<!-- <div class="border" style=" width: 520px; height: 120px;"> <!-- <div class="border" style=" width: 520px; height: 120px;">
<span style="height: 30px; font-size: 18px;">单词音频:</span> <span style="height: 30px; font-size: 18px;">单词音频:</span>
<br> <br>
......
...@@ -460,14 +460,16 @@ cc.Class({ ...@@ -460,14 +460,16 @@ cc.Class({
currentStrokeIdx: 0, currentStrokeIdx: 0,
currentStrokeStageIdx: 0 currentStrokeStageIdx: 0
} }
this.sharkNode.parent = null; if(this.sharkNode) {
this.sharkNode = null; this.sharkNode.parent = null;
this.sharkNode = null;
}
this.updateLetter(); this.updateLetter();
}, },
updateLetter() { updateLetter() {
this.letter = this.data.letterList[this._status.currentLetterIdx]; this.letter = this.data.letterList[this._status.currentLetterIdx];
this.letter = this.letter.toUpperCase(); // this.letter = this.letter.toUpperCase();
this.createLetterPage(this.letter); this.createLetterPage(this.letter);
this.updatePicturePage(); this.updatePicturePage();
}, },
...@@ -961,19 +963,25 @@ cc.Class({ ...@@ -961,19 +963,25 @@ cc.Class({
await this.showCompleteStar(); await this.showCompleteStar();
this.playEffect(`letter${this.letter.toUpperCase()}`); this.playEffect(`letter${this.letter.toUpperCase()}`);
// await this.showRibbons(); // await this.showRibbons();
await this.fireworks() if(this._status.currentLetterIdx != (this.data.letterList.length-1)) {
this.playEffect('撒花'); await this.fireworks()
this.playEffect('撒花');
}
await this.showCloud(); await this.showCloud();
// console.log(this._status.currentLetterIdx, this.data.letterList.length-1) // console.log(this._status.currentLetterIdx, this.data.letterList.length-1)
if (this.letter !== this.letter.toLowerCase()) { // if (this.letter !== this.letter.toLowerCase()) {
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.pageFlyOut();
this.createLetterPage(this.letter); this.loadNextLetter()
} else {
if(this._status.currentLetterIdx != (this.data.letterList.length-1)) {
this.pageFlyOut();
this.loadNextLetter()
}
} }
}, },
......
module.exports = { module.exports = {
letterList: [ letterList: ["A", "a", "B", "C", "d"]
'g', 'u', 'x'
]
} }
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