Commit 0008b55e authored by Tt's avatar Tt

修改多行字字体大小

parent 79b6031b
......@@ -1946,8 +1946,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
-204.725,
-30.240000000000002,
0,
0,
0,
......@@ -1970,7 +1970,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "90JZlywChCposyxZ7n2a5O"
"_id": "bbZ9Gd/65HyLhWDKXNQ561"
},
{
"__type__": "cc.Label",
......@@ -2003,7 +2003,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "4etNMpn5pDsZzUA7ILmMeI"
"_id": "bfwsiPIORDkrGtD7+IQVoC"
},
{
"__type__": "cc.PrivateNode",
......@@ -2042,8 +2042,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
127.33500000000001,
-30.240000000000002,
0,
0,
0,
......@@ -2066,7 +2066,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "22TvLZX1lFRY/4vJ8An4VP"
"_id": "c3cy9Asd5LmLkxr6SvEcDB"
},
{
"__type__": "cc.Label",
......@@ -2099,7 +2099,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "abqm6vPjtAxqmOI2/Z9fLN"
"_id": "98Br8cljlIraPs78yg8TjV"
},
{
"__type__": "cc.RichText",
......@@ -2646,8 +2646,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
-204.725,
-6.239999999999995,
0,
0,
0,
......@@ -2670,7 +2670,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "7eLLgVzz9Nq5PHAuIHgT7X"
"_id": "c1JLOO7TNFgrA1Mtowb8Xz"
},
{
"__type__": "cc.Label",
......@@ -2703,7 +2703,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "47HAjgHgRLtYcfG5F8SBKK"
"_id": "6573It9R9JKJnEXsrDMpaL"
},
{
"__type__": "cc.PrivateNode",
......@@ -2742,8 +2742,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
127.33500000000001,
-6.239999999999995,
0,
0,
0,
......@@ -2766,7 +2766,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "85QoeuAkdKHKWHLfLLgFZR"
"_id": "efenZICw1O2qPxa09EoLTM"
},
{
"__type__": "cc.Label",
......@@ -2799,7 +2799,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "08lHCwDjJIvZ4kTfmWxKmP"
"_id": "3cAfpq9/FBfId5hINmP5lP"
},
{
"__type__": "cc.PrivateNode",
......@@ -2838,8 +2838,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
-204.725,
-54.239999999999995,
0,
0,
0,
......@@ -2862,7 +2862,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "89fOnbB+1A+LJI8L+A+RME"
"_id": "4fbZDI5c9BEY4cLsoyfSw2"
},
{
"__type__": "cc.Label",
......@@ -2895,7 +2895,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "769NGSnXlDGJ6dmoJVeoOo"
"_id": "12CZJvW2ZDXaGEsosfp9nI"
},
{
"__type__": "cc.PrivateNode",
......@@ -2934,8 +2934,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
127.33500000000001,
-54.239999999999995,
0,
0,
0,
......@@ -2958,7 +2958,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "62J3svD05D45mkJx8emPTD"
"_id": "cdnkJrMxRKy66Xk+CyD3bI"
},
{
"__type__": "cc.Label",
......@@ -2991,7 +2991,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "e38pP21PpM0b+VeOf6lJs6"
"_id": "940cDItoNBi7a4jJDLeo6H"
},
{
"__type__": "cc.RichText",
......@@ -3970,8 +3970,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
-263.44,
-7.019999999999996,
0,
0,
0,
......@@ -3994,7 +3994,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "7aB/MmQSlDzpAbSkAsKr+x"
"_id": "4150LzxOhN3K2thuFs9DrV"
},
{
"__type__": "cc.Label",
......@@ -4027,7 +4027,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "42ZJ4RY3tFd6/b/YTm2JuD"
"_id": "67Cw70HyJIzK1NFDDOzSWq"
},
{
"__type__": "cc.PrivateNode",
......@@ -4066,8 +4066,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
68.62,
-7.019999999999996,
0,
0,
0,
......@@ -4090,7 +4090,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "f02x1MgThNu4OcgwZeGkeO"
"_id": "24lanJ4fpHI44i7p+TThPF"
},
{
"__type__": "cc.Label",
......@@ -4123,7 +4123,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "75Eg6TEU1CtrHfrbJVbi18"
"_id": "29szcdcG1PUYxycCKd8QYI"
},
{
"__type__": "cc.PrivateNode",
......@@ -4162,8 +4162,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
146.01,
-7.019999999999996,
0,
0,
0,
......@@ -4186,7 +4186,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "cfsTrap9BD3q+GZVapnz2b"
"_id": "884asprudBg5OPakrB0Ljk"
},
{
"__type__": "cc.Label",
......@@ -4219,7 +4219,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "06v0xAcsxN2odFfZpl7A1M"
"_id": "e0/m2d2pxMWJ+RpQRHYdZd"
},
{
"__type__": "cc.PrivateNode",
......@@ -4258,8 +4258,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
-146.015,
-61.019999999999996,
0,
0,
0,
......@@ -4282,7 +4282,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "04EpHN159Fkogzy1jMYUR2"
"_id": "48hIrptYBKJr4saubPrWUf"
},
{
"__type__": "cc.Label",
......@@ -4315,7 +4315,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "8434UCjuZNJIRTynRxZ0oU"
"_id": "08y2U3eV1OZ7eUodCendfZ"
},
{
"__type__": "cc.PrivateNode",
......@@ -4354,8 +4354,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
68.625,
-61.019999999999996,
0,
0,
0,
......@@ -4378,7 +4378,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "80vw/tAOFBJ7udg4odb+cu"
"_id": "bb/bmJZVVCkrWWAXjagxKr"
},
{
"__type__": "cc.Label",
......@@ -4411,7 +4411,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "6b+LWppztHIq5tNI9bALzR"
"_id": "366t4BdP5P8rxqJ8w0vC3q"
},
{
"__type__": "cc.RichText",
......
......@@ -161,8 +161,13 @@ export default class SceneComponent extends MyCocosSceneComponent {
let text = pg.view.find(item, 'content/text');
if (data.meetType.indexOf('text') > -1) {
text.active = true;
let str = this.getText(data.meetTextArr, `#F7D63A`, `#FFFFFF`);
let { str, wordCount } = this.getText(data.meetTextArr, `#F7D63A`, `#FFFFFF`);
text.getComponent(cc.RichText).string = str;
if (wordCount > 30) {
text.getComponent(cc.RichText).fontSize = 36;
} else {
text.getComponent(cc.RichText).fontSize = 48;
}
} else {
text.active = false;
}
......@@ -304,8 +309,13 @@ export default class SceneComponent extends MyCocosSceneComponent {
let text = pg.view.find(item, 'content/text');
if (data.vegetableType.indexOf('text') > -1) {
text.active = true;
let str = this.getText(data.vegetableTextArr, `#00580A`, `#3E8E2C`);
let { str, wordCount } = this.getText(data.vegetableTextArr, `#00580A`, `#3E8E2C`);
text.getComponent(cc.RichText).string = str;
if (wordCount > 30) {
text.getComponent(cc.RichText).fontSize = 36;
} else {
text.getComponent(cc.RichText).fontSize = 48;
}
} else {
text.active = false;
}
......@@ -450,8 +460,14 @@ export default class SceneComponent extends MyCocosSceneComponent {
let img_text = pg.view.find(item, 'img_text');
if (data.pieType == 'img_text') {
img_text.active = true;
let str = this.getText(data.pieTextArr, `#AF5725`, `#00580A`);
let { str, wordCount } = this.getText(data.mainTextArr, `#AF5725`, `#00580A`);
img_text.getComponent(cc.RichText).string = str;
if (wordCount > 30) {
img_text.getComponent(cc.RichText).fontSize = 36;
} else {
img_text.getComponent(cc.RichText).fontSize = 48;
}
} else {
img_text.active = false;
}
......@@ -459,8 +475,13 @@ export default class SceneComponent extends MyCocosSceneComponent {
let text = pg.view.find(item, 'text');
if (data.pieType == 'text') {
text.active = true;
let str = this.getText(data.pieTextArr, `#AF5725`, `#00580A`);
let { str, wordCount } = this.getText(data.pieTextArr, `#AF5725`, `#00580A`);
text.getComponent(cc.RichText).string = str;
if (wordCount > 30) {
text.getComponent(cc.RichText).fontSize = 36;
} else {
text.getComponent(cc.RichText).fontSize = 48;
}
} else {
text.active = false;
}
......@@ -505,8 +526,13 @@ export default class SceneComponent extends MyCocosSceneComponent {
let text = pg.view.find(item, 'text');
if (data.mainType.indexOf('text') > -1) {
text.active = true;
let str = this.getText(data.mainTextArr, `#AF5725`, `#00580A`);
let { str, wordCount } = this.getText(data.mainTextArr, `#AF5725`, `#00580A`);
text.getComponent(cc.RichText).string = str;
if (wordCount > 30) {
text.getComponent(cc.RichText).fontSize = 36;
} else {
text.getComponent(cc.RichText).fontSize = 48;
}
} else {
text.active = false;
}
......@@ -521,9 +547,11 @@ export default class SceneComponent extends MyCocosSceneComponent {
getText(list, colorNormal, colorLight) {
// 列表处理
let str = "";
let wordCount = 0;
for (let i = 0; i < list.length; i++) {
let li = list[i];
let s = "";
wordCount += li.text.length;
if (li.block) {
s = `<color=${colorLight}> ${li.text} </c>`
} else {
......@@ -531,7 +559,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
}
str += s;
}
return str;
return { str, wordCount };
}
// ----------------------------------题目切换---------------------------------
// 下一题刷新选项
......
......@@ -6,24 +6,32 @@ export const defaultData =
"questions": [
{
"type": "img", "mainType": "empty", "mainText": "this is info",
"mainTextArr": [{ "text": "this", "block": true, "check": 1 }, { "text": "is", "block": false, "check": 1 },
{ "text": "info", "block": false, "check": 1 }],
"type": "img", "mainType": "empty", "mainText": "The tracks are made of steel rails that help the wheels turn fast.",
"mainTextArr": [
{ "text": "The tracks are made of steel rails that help the wheels turn fast", "block": true, "check": 1 },
{ "text": "is", "block": false, "check": 1 },
{ "text": "info", "block": false, "check": 1 }
],
"meetType": "img",
"meetText": "test info",
"meetTextArr": [{ "text": "test", "block": true, "check": 1 },
{ "text": "info", "block": false, "check": 1 }],
"pieType": "img_text",
"pieText": "Countries have their own flag.",
"pieTextArr": [{ "text": "Countries", "block": false, "check": 1 },
{ "text": "have", "block": true, "check": 1 }, { "text": "their", "block": true, "check": 1 },
{ "text": "own", "block": true, "check": 1 }, { "text": "flag.", "block": false, "check": 1 }
"pieText": "The tracks are made of steel rails that help the wheels turn fast.",
"pieTextArr": [
{ "text": "The", "block": false, "check": 1 },
{ "text": "tracks", "block": true, "check": 1 },
{ "text": "are", "block": true, "check": 1 },
{ "text": "made", "block": true, "check": 1 },
{ "text": "of.", "block": false, "check": 1 }
],
"title": "Countries",
"meetImage": "http://staging-teach.cdn.ireadabc.com/b4494456199505bdf990fff96a0c9fb8.jpg",
"vegetableType": "text",
"vegetableText": "have one's own flag",
"vegetableTextArr": [{ "text": "have", "block": false, "check": 1 },
"vegetableTextArr":
[
{ "text": "have", "block": false, "check": 1 },
{ "text": "one's", "block": false, "check": 1 }, { "text": "own", "block": false, "check": 1 },
{ "text": "flag", "block": true, "check": 1 }],
"pieImage": "http://staging-teach.cdn.ireadabc.com/0205b2ff3fc18a109419aec0c84d5bfe.png"
......
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