Commit 93ad0fc2 authored by LWD's avatar LWD

代码提交

parent fb23390f
{
"ver": "1.1.0",
"uuid": "41ef287f-ba46-4313-a114-676b6eae4bca",
"subMetas": {}
}
\ No newline at end of file
......@@ -189,7 +189,7 @@
"array": [
0,
0,
358.80515010544025,
234.6928844255829,
0,
0,
0,
......@@ -804,7 +804,7 @@
"b": 77,
"a": 255
},
"_width": 3,
"_width": 2,
"_id": "7frrmdk2NGMbzvXCwfUI+h"
},
{
......@@ -2943,11 +2943,11 @@
"_dstBlendFactor": 771,
"_string": "telefe",
"_N$string": "telefe",
"_fontSize": 24,
"_lineHeight": 30,
"_fontSize": 28,
"_lineHeight": 32,
"_enableWrapText": false,
"_N$file": {
"__uuid__": "f0214b38-1b2a-41ef-aa3e-1d6949fd3b12"
"__uuid__": "41ef287f-ba46-4313-a114-676b6eae4bca"
},
"_isSystemFontUsed": false,
"_spacingX": 0,
......@@ -3106,11 +3106,11 @@
"_dstBlendFactor": 771,
"_string": "telefe",
"_N$string": "telefe",
"_fontSize": 24,
"_lineHeight": 30,
"_fontSize": 28,
"_lineHeight": 32,
"_enableWrapText": false,
"_N$file": {
"__uuid__": "f0214b38-1b2a-41ef-aa3e-1d6949fd3b12"
"__uuid__": "41ef287f-ba46-4313-a114-676b6eae4bca"
},
"_isSystemFontUsed": false,
"_spacingX": 0,
......@@ -3563,8 +3563,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 90,
"height": 42.84
"width": 130,
"height": 50
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -3617,11 +3617,11 @@
"_dstBlendFactor": 771,
"_string": "telefe",
"_N$string": "telefe",
"_fontSize": 32,
"_lineHeight": 36,
"_fontSize": 40,
"_lineHeight": 44,
"_enableWrapText": false,
"_N$file": {
"__uuid__": "f0214b38-1b2a-41ef-aa3e-1d6949fd3b12"
"__uuid__": "41ef287f-ba46-4313-a114-676b6eae4bca"
},
"_isSystemFontUsed": false,
"_spacingX": 0,
......@@ -3726,8 +3726,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 90,
"height": 42.84
"width": 130,
"height": 50
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -3780,11 +3780,11 @@
"_dstBlendFactor": 771,
"_string": "telefe",
"_N$string": "telefe",
"_fontSize": 32,
"_lineHeight": 36,
"_fontSize": 40,
"_lineHeight": 44,
"_enableWrapText": false,
"_N$file": {
"__uuid__": "f0214b38-1b2a-41ef-aa3e-1d6949fd3b12"
"__uuid__": "41ef287f-ba46-4313-a114-676b6eae4bca"
},
"_isSystemFontUsed": false,
"_spacingX": 0,
......
......@@ -80,8 +80,8 @@ var game = cc.Class({
// 求出 ScrollView 可视区域在世界坐标系中的矩形(碰撞盒)
let svBBoxRect = cc.rect(
svLeftBottomPoint.x - 60,
svLeftBottomPoint.y - 30,
svLeftBottomPoint.x - 120,
svLeftBottomPoint.y - 100,
node.width,
node.height
);
......@@ -107,6 +107,9 @@ var game = cc.Class({
this.idx = this.checkNodeParent();
g.data_mgr.nowNum = itemArr.length;
itemArr.sort(function () { return Math.random() > 0.5 ? -1 : 1; })
for (var i = 0; i < itemArr.length; i++) {
let newItem_0 = cc.instantiate(this.Item_0[itemArr.length > 14 ? 0 : 1]);
......
......@@ -213,11 +213,11 @@ cc.Class({
if (this.Item_name.node.active) {
this.Item_name.node.active = false;
this.Item_photo.active = true;
this.Item_redName.active = false;
this.Item_redName.node.active = false;
} else {
this.Item_name.node.active = true;
this.Item_photo.active = false;
this.Item_redName.active = true;
this.Item_redName.node.active = true;
}
})
.to(0.3, { scaleX: scaleX })
......
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