Commit 1b04e39b authored by huoshizhe's avatar huoshizhe

feat: 文件夹名问题

parent d590b221
...@@ -4142,8 +4142,8 @@ ...@@ -4142,8 +4142,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 60, "width": 70,
"height": 49.72 "height": 50
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -4208,7 +4208,7 @@ ...@@ -4208,7 +4208,7 @@
"_styleFlags": 0, "_styleFlags": 0,
"_underlineHeight": 0, "_underlineHeight": 0,
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 0, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 3, "_N$overflow": 3,
"_N$cacheMode": 0, "_N$cacheMode": 0,
...@@ -4239,7 +4239,7 @@ ...@@ -4239,7 +4239,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 60, "width": 70,
"height": 49.72 "height": 49.72
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -4305,7 +4305,7 @@ ...@@ -4305,7 +4305,7 @@
"_styleFlags": 0, "_styleFlags": 0,
"_underlineHeight": 0, "_underlineHeight": 0,
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 0, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 3, "_N$overflow": 3,
"_N$cacheMode": 0, "_N$cacheMode": 0,
...@@ -6233,7 +6233,7 @@ ...@@ -6233,7 +6233,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 70, "width": 70,
"height": 49.72 "height": 50
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -6298,7 +6298,7 @@ ...@@ -6298,7 +6298,7 @@
"_styleFlags": 0, "_styleFlags": 0,
"_underlineHeight": 0, "_underlineHeight": 0,
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 0, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 3, "_N$overflow": 3,
"_N$cacheMode": 0, "_N$cacheMode": 0,
...@@ -6395,7 +6395,7 @@ ...@@ -6395,7 +6395,7 @@
"_styleFlags": 0, "_styleFlags": 0,
"_underlineHeight": 0, "_underlineHeight": 0,
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 0, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 3, "_N$overflow": 3,
"_N$cacheMode": 0, "_N$cacheMode": 0,
...@@ -8322,8 +8322,8 @@ ...@@ -8322,8 +8322,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 60, "width": 70,
"height": 49.72 "height": 50
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -8388,7 +8388,7 @@ ...@@ -8388,7 +8388,7 @@
"_styleFlags": 0, "_styleFlags": 0,
"_underlineHeight": 0, "_underlineHeight": 0,
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 0, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 3, "_N$overflow": 3,
"_N$cacheMode": 0, "_N$cacheMode": 0,
...@@ -8419,7 +8419,7 @@ ...@@ -8419,7 +8419,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 60, "width": 70,
"height": 49.72 "height": 49.72
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -8485,7 +8485,7 @@ ...@@ -8485,7 +8485,7 @@
"_styleFlags": 0, "_styleFlags": 0,
"_underlineHeight": 0, "_underlineHeight": 0,
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 0, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 3, "_N$overflow": 3,
"_N$cacheMode": 0, "_N$cacheMode": 0,
...@@ -10412,8 +10412,8 @@ ...@@ -10412,8 +10412,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 60, "width": 70,
"height": 49.72 "height": 50
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -10478,7 +10478,7 @@ ...@@ -10478,7 +10478,7 @@
"_styleFlags": 0, "_styleFlags": 0,
"_underlineHeight": 0, "_underlineHeight": 0,
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 0, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 3, "_N$overflow": 3,
"_N$cacheMode": 0, "_N$cacheMode": 0,
...@@ -10509,7 +10509,7 @@ ...@@ -10509,7 +10509,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 60, "width": 70,
"height": 27.72 "height": 27.72
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -10575,7 +10575,7 @@ ...@@ -10575,7 +10575,7 @@
"_styleFlags": 0, "_styleFlags": 0,
"_underlineHeight": 0, "_underlineHeight": 0,
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 0, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 3, "_N$overflow": 3,
"_N$cacheMode": 0, "_N$cacheMode": 0,
...@@ -12502,8 +12502,8 @@ ...@@ -12502,8 +12502,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 60, "width": 70,
"height": 27.72 "height": 50
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -12568,7 +12568,7 @@ ...@@ -12568,7 +12568,7 @@
"_styleFlags": 0, "_styleFlags": 0,
"_underlineHeight": 0, "_underlineHeight": 0,
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 0, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 3, "_N$overflow": 3,
"_N$cacheMode": 0, "_N$cacheMode": 0,
...@@ -12599,7 +12599,7 @@ ...@@ -12599,7 +12599,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 60, "width": 70,
"height": 27.72 "height": 27.72
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -12665,7 +12665,7 @@ ...@@ -12665,7 +12665,7 @@
"_styleFlags": 0, "_styleFlags": 0,
"_underlineHeight": 0, "_underlineHeight": 0,
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 0, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 3, "_N$overflow": 3,
"_N$cacheMode": 0, "_N$cacheMode": 0,
......
...@@ -195,7 +195,11 @@ cc.Class({ ...@@ -195,7 +195,11 @@ cc.Class({
}); });
let storyBoxMenuLength = 0; let storyBoxMenuLength = 0;
menuItemDataList.forEach((data, idx) => { data.rows.filter((row) => {
return row.name != '默认';
}).forEach((data, idx) => {
console.log(data.name);
if (!data) { if (!data) {
console.log('wordsMenuItemData') console.log('wordsMenuItemData')
return; return;
...@@ -209,8 +213,10 @@ cc.Class({ ...@@ -209,8 +213,10 @@ cc.Class({
const menuBase = cc.find('bubbleBase', node); const menuBase = cc.find('bubbleBase', node);
const label = cc.find('label', node); const label = cc.find('label', node);
label.getComponent(cc.Label).string = data.name;
label.active = true; label.active = true;
const labelSelected = cc.find('labelSelected', node); const labelSelected = cc.find('labelSelected', node);
labelSelected.getComponent(cc.Label).string = data.name;
labelSelected.active = false; labelSelected.active = false;
const btn = cc.find('btn', node); const btn = cc.find('btn', node);
...@@ -228,6 +234,7 @@ cc.Class({ ...@@ -228,6 +234,7 @@ cc.Class({
.to(0.1, { scale: 1.0 }) .to(0.1, { scale: 1.0 })
.call(() => { .call(() => {
if (data.has_child == '0') { if (data.has_child == '0') {
this.hideAllSubmenu();
btn.active = false; btn.active = false;
btnSelected.active = true; btnSelected.active = true;
...@@ -300,6 +307,7 @@ cc.Class({ ...@@ -300,6 +307,7 @@ cc.Class({
} }
}); });
const titleNode = cc.find('middleLayer/storyBox/menu/menuBase/title'); const titleNode = cc.find('middleLayer/storyBox/menu/menuBase/title');
titleNode.y = 30 + storyBoxMenuLength * 100; titleNode.y = 30 + storyBoxMenuLength * 100;
...@@ -325,11 +333,9 @@ cc.Class({ ...@@ -325,11 +333,9 @@ cc.Class({
const btnLight = cc.find('btnHightLight', node); const btnLight = cc.find('btnHightLight', node);
const btnSelected = cc.find('btnSelected', node); const btnSelected = cc.find('btnSelected', node);
if (!btnSelected.active) {
btn.active = true; btn.active = true;
}
btnLight.active = false; btnLight.active = false;
btnSelected.active = false;
const menuBase = cc.find('bubbleBase', node); const menuBase = cc.find('bubbleBase', node);
menuBase.active = false; menuBase.active = false;
......
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