Commit 270ada7a authored by 李维's avatar 李维

dev commit

parent d2f3d3d4
......@@ -460,6 +460,7 @@ export class PlayComponent implements OnInit, OnDestroy {
this.g_enableMapDown = true;
return
}
this.g_cartoon.playAudio("sm_switch")
let target = this.g_cartoon.getCartoonElement(this.m_currentInput)
if(this.m_openShift) {
target.setContentText(letttes[i-1].toUpperCase())
......@@ -541,7 +542,7 @@ export class PlayComponent implements OnInit, OnDestroy {
}
})
let text = this.g_cartoon.createCartoonElementLabelFunc(`block_${questionIndex}_${li}_letter`, "", "Aileron-Black", "#FFFFFF", 76, (w, h)=>{
let text = this.g_cartoon.createCartoonElementLabelFunc(`block_${questionIndex}_${li}_letter`, "", "Aileron-Black", "#FFFFFF", 52, (w, h)=>{
return {
x: 0,
y: 2,
......@@ -809,7 +810,7 @@ export class PlayComponent implements OnInit, OnDestroy {
let sX = -1*width/2 + width/colNum/2
let sY = - height/2 + height/rolNum/2
let step = (width/colNum)<(height/rolNum)?(width/colNum):(height/rolNum);
let step = (width/colNum)<(height/rolNum)?(width/colNum):(height/rolNum) + 8;
this.m_blockGroup = new Array(this.g_formData.dataArray.length);
......@@ -854,6 +855,7 @@ export class PlayComponent implements OnInit, OnDestroy {
element.ref.alpha = 0;
element.in = (callback) => {
this.g_cartoon.playAudio("sm_checkin");
return tweenChange(element.ref, {y: 0}, 1, ()=> {
callback && callback()
})
......@@ -938,7 +940,7 @@ export class PlayComponent implements OnInit, OnDestroy {
})
bgMiddleMask.ref.addChild(checkTop.ref)
let labelText = this.g_cartoon.createCartoonElementLabel("Chenck_label_title", "Check", "Aileron-Bold", "#FFFFFF", 60)
let labelText = this.g_cartoon.createCartoonElementLabel("Chenck_label_title", "Check", "Aileron-Black", "#FFFFFF", 60)
checkTop.ref.addChild(labelText.ref);
let checkBottom = this.g_cartoon.createCartoonElementImageFunc(`checkpannel_checnk_bottom`, "check_bottom", (w, h)=>{
......@@ -966,7 +968,7 @@ export class PlayComponent implements OnInit, OnDestroy {
}
})
let textSubmit = this.g_cartoon.createCartoonElementLabelFunc("button_submit_text", "更多练习", "Aileron-Black", "#FFFFFF", 64, (w, h)=>{
let textSubmit = this.g_cartoon.createCartoonElementLabelFunc("button_submit_text", "更多练习", "Aileron-Bold", "#FFFFFF", 64, (w, h)=>{
return {
x: 0,
y: 0,
......@@ -990,6 +992,7 @@ export class PlayComponent implements OnInit, OnDestroy {
checkBottom.ref.addChild(btnMore.ref)
this.subscribeMapDownEvent(btnMore.id, async ()=>{
this.g_cartoon.playAudio("sm_moreinfo")
await this.buttonPressAnimation(btnMore.id, btnMoreShadow.id)
this.g_enableMapDown = true;
})
......@@ -1253,7 +1256,7 @@ export class PlayComponent implements OnInit, OnDestroy {
let padding = 30;
let scrollContent = this.g_cartoon.getCartoonElement("check_scroll_pannel")
let totalHeight = height
let text = this.g_cartoon.createCartoonElementLabel("text", data.text, "DroidSansFallback", "#FFFFFF", 48)
let text = this.g_cartoon.createCartoonElementLabel("text", data.text, "Aileron-Bold", "#FFFFFF", 48)
text.ref.textAlign = "left";
text.ref.warpLineHeight = 64;
text.ref.maxSingalLineWidth = 800;
......@@ -1273,12 +1276,12 @@ export class PlayComponent implements OnInit, OnDestroy {
totalHeight += (text.ref.lineNum + 1) * 64;
scrollContent.ref.addChild(text.ref)
let wordColorBG = this.g_cartoon.createCartoonElementShapeRect("eeeeee", 360, 64, data.right?"#007b3e":"#d71818");
let wordColorBG = this.g_cartoon.createCartoonElementShapeRect("wordColorBG", 360, 64, data.right?"#007b3e":"#d71818");
wordColorBG.ref.radius = 16
wordColorBG.ref.y = totalHeight + padding + 64 / 2
totalHeight += padding + 64;
let word = this.g_cartoon.createCartoonElementLabel("text-label", data.word, "Aileron-Black", "#FFFFFF", 48)
let word = this.g_cartoon.createCartoonElementLabel("text-label", data.word, "Aileron-Bold", "#FFFFFF", 48)
word.ref.x = 360 / 2
word.ref.y = 64 / 2 + 5
wordColorBG.ref.addChild(word.ref);
......@@ -1298,7 +1301,7 @@ export class PlayComponent implements OnInit, OnDestroy {
})
totalHeight += 120 + padding;
let word = this.g_cartoon.createCartoonElementLabel("text-label", data.rightWord, "Aileron-Black", "#ffe9b1", 52)
let word = this.g_cartoon.createCartoonElementLabel("text-label", data.rightWord, "Aileron-Bold", "#ffe9b1", 52)
word.ref.x = 0
word.ref.y = 0
ele.ref.addChild(word.ref)
......@@ -1441,7 +1444,7 @@ export class PlayComponent implements OnInit, OnDestroy {
} else{
console.log("全部正确")
}
this.g_cartoon.playAudio("sm_submit")
this.m_blockGroup.forEach(group => {
group.forEach(block => {
block.modified = false;
......
......@@ -92,7 +92,11 @@ const localAudios = {
'sm-go': 'assets/default/audio/sm-go.mp3',
'sm-ready': 'assets/default/audio/sm-ready.mp3',
'sm_switch': 'assets/play/sound/sm_switch.mp3'
'sm_switch': 'assets/play/sound/sm_switch.mp3',
'sm_checkin': 'assets/play/sound/sm_checkin.mp3',
'sm_moreinfo': 'assets/play/sound/sm_moreinfo.mp3',
'sm_submit': 'assets/play/sound/sm_submit.mp3'
};
const multiSizeBackground = {
......
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