Commit 2f4c3ded authored by liujiangnan's avatar liujiangnan

feat

parent 602c886e
...@@ -88,8 +88,8 @@ cc.Class({ ...@@ -88,8 +88,8 @@ cc.Class({
this.uid = res.uid; this.uid = res.uid;
// 测试数据 // 测试数据
this.role = 'anchor'; // this.role = 'anchor';
this.uid = 'teacher'; // this.uid = 'teacher';
// this.role = 'audience'; // this.role = 'audience';
// this.uid = 'student' // this.uid = 'student'
......
...@@ -144,9 +144,9 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -144,9 +144,9 @@ export default class SceneComponent extends MyCocosSceneComponent {
cc.find(`syllabus_item/label`, itemClone).getComponent(cc.Label).string = row.text_en; cc.find(`syllabus_item/label`, itemClone).getComponent(cc.Label).string = row.text_en;
cc.find(`syllabus_item/label_disable`, itemClone).getComponent(cc.Label).string = row.text_en; cc.find(`syllabus_item/label_disable`, itemClone).getComponent(cc.Label).string = row.text_en;
if (row.has_child) { if (row.has_child) {
cc.find(`Canvas/check_all`).active = false; cc.find(`Canvas/mainpage/toolbar/check_all`).active = false;
} else { } else {
cc.find(`Canvas/check_all`).active = true; cc.find(`Canvas/mainpage/toolbar/check_all`).active = true;
} }
itemClone.attr({treeNodeId: row.id, treeNodePid: row.pid, hasChild: row.has_child}); itemClone.attr({treeNodeId: row.id, treeNodePid: row.pid, hasChild: row.has_child});
} }
...@@ -185,6 +185,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -185,6 +185,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
if (!this.canTouch) { if (!this.canTouch) {
return; return;
} }
cc.find(`Canvas/mainpage/toolbar/fanhui`).active = true;
this.canTouch = false; this.canTouch = false;
this.pid = node.treeNodeId; this.pid = node.treeNodeId;
this.nodePath.push(node); this.nodePath.push(node);
...@@ -204,6 +205,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -204,6 +205,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
if (node && node.treeNodePid) { if (node && node.treeNodePid) {
this.pid = node.treeNodePid; this.pid = node.treeNodePid;
} else { } else {
cc.find(`Canvas/mainpage/toolbar/fanhui`).active = false;
this.pid = null; this.pid = null;
} }
await this.loadData(); await this.loadData();
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "934f1798-35d0-4290-b7b4-25f6127bf7f8", "uuid": "ff16768f-fa8c-4aaf-905f-26dd86bae56c",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -11,10 +11,10 @@ ...@@ -11,10 +11,10 @@
"height": 133, "height": 133,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"check_all": { "btn_bg": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "943ada31-1a12-4bcc-a46b-f4fadc5c3ae2", "uuid": "ebf98170-4e8c-4c9d-ae3d-ceed8967eb51",
"rawTextureUuid": "934f1798-35d0-4290-b7b4-25f6127bf7f8", "rawTextureUuid": "ff16768f-fa8c-4aaf-905f-26dd86bae56c",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
...@@ -22,10 +22,10 @@ ...@@ -22,10 +22,10 @@
"offsetY": 0, "offsetY": 0,
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 219, "width": 110,
"height": 133, "height": 67,
"rawWidth": 219, "rawWidth": 110,
"rawHeight": 133, "rawHeight": 67,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
{
"ver": "2.3.5",
"uuid": "a5571db3-4eb8-4d89-8713-f3e594c861c2",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 102,
"height": 97,
"platformSettings": {},
"subMetas": {
"choice_full": {
"ver": "1.0.4",
"uuid": "f76d87a7-42b4-40ba-9665-258847535224",
"rawTextureUuid": "a5571db3-4eb8-4d89-8713-f3e594c861c2",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 102,
"height": 97,
"rawWidth": 102,
"rawHeight": 97,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "f3f9b0b3-7d40-48eb-9d26-e3558714e243",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 102,
"height": 97,
"platformSettings": {},
"subMetas": {
"fanhui": {
"ver": "1.0.4",
"uuid": "cc812fa0-2b12-462e-9965-aa493a88c678",
"rawTextureUuid": "f3f9b0b3-7d40-48eb-9d26-e3558714e243",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 102,
"height": 97,
"rawWidth": 102,
"rawHeight": 97,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "64161b86-3191-439f-a0e0-3f0f04e30e18",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 102,
"height": 97,
"platformSettings": {},
"subMetas": {
"shouye": {
"ver": "1.0.4",
"uuid": "78eee72b-6f40-4087-9957-530bb18497b0",
"rawTextureUuid": "64161b86-3191-439f-a0e0-3f0f04e30e18",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 102,
"height": 97,
"rawWidth": 102,
"rawHeight": 97,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
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