Commit 5649789a authored by yu's avatar yu

7.25调整

parent e65dfe51
{"ver":"1.1.2","uuid":"ac93192e-6307-43b6-8055-13da3a868d9e","isBundle":false,"bundleName":"","priority":1,"compressionType":{},"optimizeHotUpdate":{},"inlineSpriteFrames":{},"isRemoteBundle":{"ios":false,"android":false},"subMetas":{}} {
\ No newline at end of file "ver": "1.1.2",
"uuid": "ac93192e-6307-43b6-8055-13da3a868d9e",
"isBundle": false,
"bundleName": "",
"priority": 1,
"compressionType": {},
"optimizeHotUpdate": {},
"inlineSpriteFrames": {},
"isRemoteBundle": {
"ios": false,
"android": false
},
"subMetas": {}
}
\ No newline at end of file
...@@ -2253,7 +2253,7 @@ ...@@ -2253,7 +2253,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
5, 5,
-24.169, -26.169,
0, 0,
0, 0,
0, 0,
...@@ -2586,7 +2586,7 @@ ...@@ -2586,7 +2586,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
309, 309,
0, -2,
0, 0,
0, 0,
0, 0,
...@@ -2635,7 +2635,7 @@ ...@@ -2635,7 +2635,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 73.86, "width": 79.7,
"height": 60.48 "height": 60.48
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -2647,7 +2647,7 @@ ...@@ -2647,7 +2647,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-36.93, -39.85,
0, 0,
0, 0,
0, 0,
...@@ -2671,7 +2671,7 @@ ...@@ -2671,7 +2671,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "e6Gzqqr2JEjbam7KLUJcI1" "_id": "55v3ZdjDNClp5NV+D2BtGU"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -2688,8 +2688,8 @@ ...@@ -2688,8 +2688,8 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "Rich", "_string": "sdsa",
"_N$string": "Rich", "_N$string": "sdsa",
"_fontSize": 36, "_fontSize": 36,
"_lineHeight": 48, "_lineHeight": 48,
"_enableWrapText": true, "_enableWrapText": true,
...@@ -2706,7 +2706,7 @@ ...@@ -2706,7 +2706,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "0djifX+xJJXo/WYjmPxEWx" "_id": "25hVA1G2BEQq4tyqRuoh6A"
}, },
{ {
"__type__": "cc.RichText", "__type__": "cc.RichText",
...@@ -2718,7 +2718,7 @@ ...@@ -2718,7 +2718,7 @@
"_enabled": true, "_enabled": true,
"_fontFamily": "Arial", "_fontFamily": "Arial",
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
"_N$string": "<color=#00ff00>Rich</c>", "_N$string": "<color=#00ff00>sdsa</c>",
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$fontSize": 36, "_N$fontSize": 36,
"_N$font": { "_N$font": {
......
...@@ -305,8 +305,8 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -305,8 +305,8 @@ export default class SceneComponent extends MyCocosSceneComponent {
btn_laba1.active = count % 2 == 0; btn_laba1.active = count % 2 == 0;
btn_laba2.active = count % 2 == 1; btn_laba2.active = count % 2 == 1;
if (stop && count % 2 == 0) { if (stop && count % 2 == 0) {
// btn_laba1.active = false; btn_laba1.active = true;
// btn_laba2.active = false; btn_laba2.active = true;
clearInterval(this.intervalId); clearInterval(this.intervalId);
} }
}, 150) }, 150)
...@@ -694,6 +694,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -694,6 +694,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
// let pag = cc.find("PageView", this.node); // let pag = cc.find("PageView", this.node);
// pag.getComponent(cc.PageView).enabled = true; // pag.getComponent(cc.PageView).enabled = true;
// pag.getComponent(cc.PageView).scrollToPage(this.roundIdx, 0.1); // pag.getComponent(cc.PageView).scrollToPage(this.roundIdx, 0.1);
this.resetLaba();
this.setPagBg(); this.setPagBg();
this.initDown(); this.initDown();
this.initMiddle(); this.initMiddle();
...@@ -711,6 +712,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -711,6 +712,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
// if (len <= 1) return; // if (len <= 1) return;
// pag.getComponent(cc.PageView).enabled = true; // pag.getComponent(cc.PageView).enabled = true;
// pag.getComponent(cc.PageView).scrollToPage(this.roundIdx, 0.1); // pag.getComponent(cc.PageView).scrollToPage(this.roundIdx, 0.1);
this.resetLaba();
this.setPagBg(); this.setPagBg();
this.initDown(); this.initDown();
this.initMiddle(); this.initMiddle();
...@@ -718,6 +720,14 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -718,6 +720,14 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.resetText(); this.resetText();
this.resetRecord(); this.resetRecord();
} }
private resetLaba(){
if (this.intervalId) clearInterval(this.intervalId);
let btn_play = cc.find("btn_play", this.node);
let btn_laba1 = btn_play.getChildByName("btn_laba1");
let btn_laba2 = btn_play.getChildByName("btn_laba2");
btn_laba1.active = true;
btn_laba2.active = true;
}
/** /**
* 重置文字 * 重置文字
......
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