Commit c9b8f250 authored by Tt's avatar Tt

调整1

parent 4f707d8e
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div style="width:100%;vertical-align:middle; padding-top: 10px; padding-bottom: 10px; text-align: left;"> <div style="width:100%;vertical-align:middle; padding-top: 10px; padding-bottom: 10px; text-align: left;">
<span style="font-weight: 700; font-size: 30px; vertical-align:middle;">标题:</span> <span style="font-weight: 700; font-size: 30px; vertical-align:middle;">标题:</span>
<input [(ngModel)]="biaoti.title" type="text" <input (blur)="saveItem()" [(ngModel)]="biaoti.title" type="text"
style="width: 1000px;height:35px;margin-left: 30px; vertical-align:middle;font-size: 30px; border: 1px solid #ccc; border-radius: 10px;" /> style="width: 1000px;height:35px;margin-left: 30px; vertical-align:middle;font-size: 30px; border: 1px solid #ccc; border-radius: 10px;" />
</div> </div>
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<div style="width:100%;vertical-align:middle; padding-top: 10px; padding-bottom: 10px; text-align: left;"> <div style="width:100%;vertical-align:middle; padding-top: 10px; padding-bottom: 10px; text-align: left;">
<span style="font-weight: 700; font-size: 30px; vertical-align:middle;">主类:</span> <span style="font-weight: 700; font-size: 30px; vertical-align:middle;">主类:</span>
<input [(ngModel)]="zhulei.title" type="text" <input (blur)="saveItem()" [(ngModel)]="zhulei.title" type="text"
style="width: 1000px;height:35px;margin-left: 30px; vertical-align:middle;font-size: 30px; border: 1px solid #ccc; border-radius: 10px;" /> style="width: 1000px;height:35px;margin-left: 30px; vertical-align:middle;font-size: 30px; border: 1px solid #ccc; border-radius: 10px;" />
</div> </div>
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<div style="width:100%;vertical-align:middle; padding-top: 10px; padding-bottom: 10px; text-align: left;"> <div style="width:100%;vertical-align:middle; padding-top: 10px; padding-bottom: 10px; text-align: left;">
<span style="font-weight: 700; font-size: 30px; vertical-align:middle;">分类{{c+1}}:</span> <span style="font-weight: 700; font-size: 30px; vertical-align:middle;">分类{{c+1}}:</span>
<input [(ngModel)]="fenlei.title" type="text" <input (blur)="saveItem()" [(ngModel)]="fenlei.title" type="text"
style="width: 1000px;height:35px;margin-left: 30px; vertical-align:middle;font-size: 30px; border: 1px solid #ccc; border-radius: 10px;" /> style="width: 1000px;height:35px;margin-left: 30px; vertical-align:middle;font-size: 30px; border: 1px solid #ccc; border-radius: 10px;" />
</div> </div>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<button style="margin-left: 30px;" nz-button nzType="danger" (click)="deleteSon(a, b, c,d)"> <button style="margin-left: 30px;" nz-button nzType="danger" (click)="deleteSon(a, b, c,d)">
<span>删除</span> <span>删除</span>
</button> </button>
<input [(ngModel)]="sonlei.title" type="text" <input (blur)="saveItem()" [(ngModel)]="sonlei.title" type="text"
style="width: 1000px;height:35px;margin-left: 30px; vertical-align:middle;font-size: 30px; border: 1px solid #ccc; border-radius: 10px;" /> style="width: 1000px;height:35px;margin-left: 30px; vertical-align:middle;font-size: 30px; border: 1px solid #ccc; border-radius: 10px;" />
</div> </div>
......
...@@ -11,11 +11,11 @@ function retData() { ...@@ -11,11 +11,11 @@ function retData() {
"child": "child":
[ [
{ {
"title": "sub1", "title": "sub1sqinalaa",
"child": [ "child": [
{ {
"title": "son11", "title": "aaaaaadda",
"child": [ { "cardId": "", "title": "dd", "pic_url": "http://staging-teach.cdn.ireadabc.com/021d3b3904cb6e675286ac8fcb60da2b.png", "audio_url": "" }]//{ "cardId": "", "title": "aa", "pic_url": "http://staging-teach.cdn.ireadabc.com/88b1cd55a3e2ff70447331078c0e2941.png", "audio_url": "" }, { "cardId": "", "title": "bb", "pic_url": "http://staging-teach.cdn.ireadabc.com/26524d3fa6a060d80664b40cfb6105f6.png", "audio_url": "" }, { "cardId": "", "title": "cc", "pic_url": "http://staging-teach.cdn.ireadabc.com/0cd859af88f946a66313cc06e4628fd2.png", "audio_url": "" }, "child": [{ "cardId": "", "title": "aaaaaadda", "pic_url": "http://staging-teach.cdn.ireadabc.com/021d3b3904cb6e675286ac8fcb60da2b.png", "audio_url": "" }]//{ "cardId": "", "title": "aa", "pic_url": "http://staging-teach.cdn.ireadabc.com/88b1cd55a3e2ff70447331078c0e2941.png", "audio_url": "" }, { "cardId": "", "title": "bb", "pic_url": "http://staging-teach.cdn.ireadabc.com/26524d3fa6a060d80664b40cfb6105f6.png", "audio_url": "" }, { "cardId": "", "title": "cc", "pic_url": "http://staging-teach.cdn.ireadabc.com/0cd859af88f946a66313cc06e4628fd2.png", "audio_url": "" },
}, },
// { // {
// "title": "son12", // "title": "son12",
...@@ -34,7 +34,7 @@ function retData() { ...@@ -34,7 +34,7 @@ function retData() {
"title": "sub2", "title": "sub2",
"child": [{ "child": [{
"title": "son21", "title": "son21",
"child": [ { "cardId": "", "title": "e1", "pic_url": "http://staging-teach.cdn.ireadabc.com/021d3b3904cb6e675286ac8fcb60da2b.png", "audio_url": "" }]//{ "cardId": "", "title": "q1", "pic_url": "http://staging-teach.cdn.ireadabc.com/fde35aaec618529b0b2b6cb3a18d1f85.png", "audio_url": "" }, { "cardId": "", "title": "w1", "pic_url": "http://staging-teach.cdn.ireadabc.com/0cd859af88f946a66313cc06e4628fd2.png", "audio_url": "" }, "child": [{ "cardId": "", "title": "e1", "pic_url": "http://staging-teach.cdn.ireadabc.com/021d3b3904cb6e675286ac8fcb60da2b.png", "audio_url": "" }]//{ "cardId": "", "title": "q1", "pic_url": "http://staging-teach.cdn.ireadabc.com/fde35aaec618529b0b2b6cb3a18d1f85.png", "audio_url": "" }, { "cardId": "", "title": "w1", "pic_url": "http://staging-teach.cdn.ireadabc.com/0cd859af88f946a66313cc06e4628fd2.png", "audio_url": "" },
}, },
// { // {
// "title": "son22", // "title": "son22",
......
This diff is collapsed.
...@@ -174,7 +174,7 @@ cc.Class({ ...@@ -174,7 +174,7 @@ cc.Class({
initView() { initView() {
this.btn_replay = pg.view.find(this, "btn_replay"); this.btn_replay = pg.view.find(this, "btn_replay");
pg.view.visible(this.btn_replay, false); // pg.view.visible(this.btn_replay, false);
pg.view.touchOn(this.btn_replay, this.onTouchReplay, this); pg.view.touchOn(this.btn_replay, this.onTouchReplay, this);
this.initLayout(); this.initLayout();
}, },
...@@ -190,11 +190,27 @@ cc.Class({ ...@@ -190,11 +190,27 @@ cc.Class({
//刷新分类 //刷新分类
pg.view.setString(pg.view.find(this, "main/sub_0/txt"), this._zhuClass.child[0].title); pg.view.setString(pg.view.find(this, "main/sub_0/txt"), this._zhuClass.child[0].title);
pg.view.setString(pg.view.find(this, "main/sub_1/txt"), this._zhuClass.child[1].title); pg.view.setString(pg.view.find(this, "main/sub_1/txt"), this._zhuClass.child[1].title);
setTimeout(() => {
this.fixTxtSize([pg.view.find(this, "main/sub_0/txt"), pg.view.find(this, "main/sub_1/txt")])
}, 30);
this.initSon(); this.initSon();
this.initLine(); this.initLine();
this.initBox(); this.initBox();
this.initItems(); this.initItems();
}, },
fixTxtSize(items) {
let minSize = 100;
items.forEach(it => {
let lb = it.getComponent(cc.Label);
lb.fontSize;
minSize = minSize > lb.actualFontSize ? lb.actualFontSize : minSize;
})
items.forEach(it => {
let lb = it.getComponent(cc.Label);
lb.actualFontSize = minSize
lb.fontSize = minSize
})
},
initSon() { initSon() {
//刷新子类 //刷新子类
let item = pg.view.find(this, "son"); let item = pg.view.find(this, "son");
...@@ -226,6 +242,7 @@ cc.Class({ ...@@ -226,6 +242,7 @@ cc.Class({
let x = -480;//-291.057 let x = -480;//-291.057
let addX = 190; let addX = 190;
let y = 75; let y = 75;
let txtArr = [];
for (let i = 0; i < list.length; i++) { for (let i = 0; i < list.length; i++) {
let data = list[i]; let data = list[i];
let itemClone = cc.instantiate(item); let itemClone = cc.instantiate(item);
...@@ -236,10 +253,14 @@ cc.Class({ ...@@ -236,10 +253,14 @@ cc.Class({
itemClone.y = posY; itemClone.y = posY;
itemClone.data = data; itemClone.data = data;
pg.view.setString(pg.view.find(itemClone, "txt"), data.title); pg.view.setString(pg.view.find(itemClone, "txt"), data.title);
txtArr.push(pg.view.find(itemClone, 'txt'));
pg.view.visible(pg.view.find(itemClone, "bg_blue"), data.type == 0); pg.view.visible(pg.view.find(itemClone, "bg_blue"), data.type == 0);
pg.view.visible(pg.view.find(itemClone, "bg_green"), data.type == 1); pg.view.visible(pg.view.find(itemClone, "bg_green"), data.type == 1);
parent.addChild(itemClone); parent.addChild(itemClone);
} }
setTimeout(() => {
this.fixTxtSize(txtArr);
}, 30);
}, },
initLine() { initLine() {
//刷新子类 //刷新子类
...@@ -452,6 +473,7 @@ cc.Class({ ...@@ -452,6 +473,7 @@ cc.Class({
pg.view.setString(txt, data.txt); pg.view.setString(txt, data.txt);
pg.view.setString(pg.view.find(success, "txt"), data.txt); pg.view.setString(pg.view.find(success, "txt"), data.txt);
pg.view.setString(pg.view.find(fail, "txt"), data.txt);
pg.view.setNetImg(icon, data.img); pg.view.setNetImg(icon, data.img);
pg.view.setNetImg(pg.view.find(success, "icon"), data.img); pg.view.setNetImg(pg.view.find(success, "icon"), data.img);
...@@ -655,7 +677,7 @@ cc.Class({ ...@@ -655,7 +677,7 @@ cc.Class({
// 游戏结束时需要调用这个方法通知系统作业完成 // 游戏结束时需要调用这个方法通知系统作业完成
onHomeworkFinish(); onHomeworkFinish();
pg.view.visible(this.btn_replay, true); // pg.view.visible(this.btn_replay, true);
}) })
}, },
...@@ -682,9 +704,10 @@ cc.Class({ ...@@ -682,9 +704,10 @@ cc.Class({
onTouchReplay() { onTouchReplay() {
this.initData(); this.initData();
this.initSingleData(); this.initSingleData();
pg.view.visible(this.btn_replay, false); // pg.view.visible(this.btn_replay, false);
// this.initStars(); // this.initStars();
this.initLayout(); // this.initLayout();
this.initItems();
}, },
createRightAni(pos) { createRightAni(pos) {
let right = pg.view.find(this, 'right'); let right = pg.view.find(this, 'right');
...@@ -706,28 +729,28 @@ cc.Class({ ...@@ -706,28 +729,28 @@ cc.Class({
}, },
createFireworkAni() { createFireworkAni() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
this.showAllFirework(cc.find('Canvas/firework_ani'), cc.find('Canvas/paperBase').children); // this.showAllFirework(cc.find('Canvas/firework_ani'), cc.find('Canvas/paperBase').children);
setTimeout(() => {
resolve('');
}, 1000);
// showFireworks(
// cc.find('Canvas/firework_ani'),
// cc.find('Canvas/RibbonNodeBase').children,
// cc.v2(0, -400), cc.v2(0, 1000), 200, 200
// );
// showFireworks(
// cc.find('Canvas/firework_ani'),
// cc.find('Canvas/RibbonNodeBase').children,
// cc.v2(-600, -400), cc.v2(200, 1000), 200, 200
// );
// showFireworks(
// cc.find('Canvas/firework_ani'),
// cc.find('Canvas/RibbonNodeBase').children,
// cc.v2(600, -400), cc.v2(-200, 1000), 200, 200
// );
// setTimeout(() => { // setTimeout(() => {
// resolve(''); // resolve('');
// }, 1000); // }, 1000);
showFireworks(
cc.find('Canvas/firework_ani'),
cc.find('Canvas/RibbonNodeBase').children,
cc.v2(0, -400), cc.v2(0, 1000), 200, 200
);
showFireworks(
cc.find('Canvas/firework_ani'),
cc.find('Canvas/RibbonNodeBase').children,
cc.v2(-600, -400), cc.v2(200, 1000), 200, 200
);
showFireworks(
cc.find('Canvas/firework_ani'),
cc.find('Canvas/RibbonNodeBase').children,
cc.v2(600, -400), cc.v2(-200, 1000), 200, 200
);
setTimeout(() => {
resolve('');
}, 1000);
}); });
}, },
playSFX(name) { playSFX(name) {
......
...@@ -22,10 +22,10 @@ ...@@ -22,10 +22,10 @@
"offsetY": 0, "offsetY": 0,
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 303, "width": 36,
"height": 132, "height": 42,
"rawWidth": 303, "rawWidth": 36,
"rawHeight": 132, "rawHeight": 42,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
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