Commit 46d5e231 authored by limingzhe's avatar limingzhe

fix: 项目名

parent 46e9e036
{
"ver": "1.1.2",
"uuid": "63b29c15-e518-4cbf-903a-b7fb2083343f",
"isBundle": false,
"bundleName": "",
"priority": 1,
"compressionType": {},
"optimizeHotUpdate": {},
"inlineSpriteFrames": {},
"isRemoteBundle": {},
"subMetas": {}
}
\ No newline at end of file
{
"ver": "1.1.2",
"uuid": "e2fe7439-afa6-476f-9d0d-961234d3d77e",
"isBundle": false,
"bundleName": "",
"priority": 1,
"compressionType": {},
"optimizeHotUpdate": {},
"inlineSpriteFrames": {},
"isRemoteBundle": {},
"subMetas": {}
}
\ No newline at end of file
This diff is collapsed.
{
"ver": "1.0.8",
"uuid": "3a6f64f9-5aa1-4c66-9688-fdf354bff7a2",
"isPlugin": false,
"loadPluginInWeb": true,
"loadPluginInNative": true,
"loadPluginInEditor": false,
"subMetas": {}
}
\ No newline at end of file
......@@ -107,8 +107,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1920,
"height": 1200
"width": 1624,
"height": 750
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -119,8 +119,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
960,
600,
812,
375,
0,
0,
0,
......@@ -172,8 +172,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1920,
"height": 1200
"width": 1624,
"height": 750
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -2074,8 +2074,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1920,
"height": 1200
"width": 1624,
"height": 750
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -2180,8 +2180,8 @@
"_enabled": true,
"_designResolution": {
"__type__": "cc.Size",
"width": 1920,
"height": 1200
"width": 1624,
"height": 750
},
"_fitWidth": false,
"_fitHeight": false,
......
......@@ -13,11 +13,11 @@ cc.Class({
properties: {
baseWidth: {
default: 1920,
default: 1624,
type: cc.Integer
},
baseHeight: {
default: 1200,
default: 750,
type: cc.Integer
}
},
......@@ -117,7 +117,7 @@ cc.Class({
getDefaultData() {
return {"aiClassData":{"time":60,"startTime":0,"itemArr":[{"gId":"0","data":{"name":"镜头","camera":true,"copy":true,"color":"#84f466"},"nickName":"镜头"},{"gId":"2","data":{"name":"龙骨","anima":true,"commonProp":true,"copy":true,"color":"#ffa4e6"},"nickName":"龙骨","skeJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/e3ab840baf83c0b0d571e2420536286f.json","name":"鱼_ske.json"},"texJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/d181f59eb6a4ad6cf124587ca6b34c0e.json","name":"鱼_tex.json"},"texPngData":{"url":"http://staging-teach.cdn.ireadabc.com/f566cca10fd83f62a465b144ac73d483.png","name":"鱼_tex.png"},"keyArrData":[{"panelGroup":[],"time":1,"x":"","anchorX":"","anchorY":"","scaleX":"0.5","scaleY":"0.5"}]},{"gId":"4","data":{"name":"按钮","pic":true,"commonProp":true},"nickName":"按钮","keyArrData":[{"panelGroup":[],"time":2.037,"x":"0","y":"0"}],"pic_url":"http://staging-teach.cdn.ireadabc.com/790525a2e3b223339c8dfcd6a97361ba.png"},{"gId":"2","data":{"name":"龙骨","anima":true,"commonProp":true,"copy":true,"color":"#ffa4e6"},"nickName":"龙骨","keyArrData":[{"panelGroup":[],"time":2.975,"x":"","y":"","times":"1","anchorX":"","anchorY":"","scaleX":"0.5","scaleY":"0.5"}],"skeJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/bd29690a750530cf6e822f6e418ed1ae.json","name":"小汽车_ske.json"},"texJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/bb18572d3c4bb94f8a9afc8ea726c90d.json","name":"小汽车_tex.json"},"texPngData":{"url":"http://staging-teach.cdn.ireadabc.com/84bce64cd4259e604a458d08ddd75bec.png","name":"小汽车_tex.png"}},{"gId":"1","data":{"name":"图片","pic":true,"fill":true,"commonProp":true,"copy":true,"color":"#ffde00"},"nickName":"图片","keyArrData":[{"panelGroup":[],"time":0.012}],"isFill":true,"pic_url":"http://staging-teach.cdn.ireadabc.com/35f003bb6d0e410494d606fd4055ddb4.png"},{"gId":"5","data":{"name":"重玩按钮","pic":true,"commonProp":true},"nickName":"重玩按钮","keyArrData":[{"panelGroup":[],"time":5,"y":"0"}],"pic_url":"http://staging-teach.cdn.ireadabc.com/3a552c7843003f6803267a03546db24b.png"},{"gId":"1","data":{"name":"图片","pic":true,"fill":true,"commonProp":true,"copy":true,"color":"#ffde00"},"nickName":"图片","pic_url":"http://staging-teach.cdn.ireadabc.com/c8abf7383d65bcbdba8f390785cece60.png","keyArrData":[{"panelGroup":[],"time":6,"x":"-0.2"}]}]}}
return {"aiClassData":{"time":60,"startTime":0,"itemArr":[{"gId":"0","data":{"name":"镜头","camera":true,"copy":true,"color":"#84f466"},"nickName":"镜头"},{"gId":"2","data":{"name":"龙骨","anima":true,"commonProp":true,"copy":true,"color":"#ffa4e6"},"nickName":"龙骨","skeJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/e3ab840baf83c0b0d571e2420536286f.json","name":"鱼_ske.json"},"texJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/d181f59eb6a4ad6cf124587ca6b34c0e.json","name":"鱼_tex.json"},"texPngData":{"url":"http://staging-teach.cdn.ireadabc.com/f566cca10fd83f62a465b144ac73d483.png","name":"鱼_tex.png"},"keyArrData":[{"panelGroup":[],"time":1,"x":"","anchorX":"","anchorY":"","scaleX":"0.5","scaleY":"0.5"},{"panelGroup":[],"time":4.375,"x":"","anchorX":"","anchorY":"","scaleX":"0.5","scaleY":"0.5","times":"","active":"false"}]},{"gId":"4","data":{"name":"按钮","pic":true,"commonProp":true},"nickName":"按钮","keyArrData":[{"panelGroup":[],"time":2.037,"x":"0","y":"0"}],"pic_url":"http://staging-teach.cdn.ireadabc.com/790525a2e3b223339c8dfcd6a97361ba.png"},{"gId":"2","data":{"name":"龙骨","anima":true,"commonProp":true,"copy":true,"color":"#ffa4e6"},"nickName":"龙骨","keyArrData":[{"panelGroup":[],"time":2.975,"x":"","y":"","times":"1","anchorX":"","anchorY":"","scaleX":"0.5","scaleY":"0.5"}],"skeJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/bd29690a750530cf6e822f6e418ed1ae.json","name":"小汽车_ske.json"},"texJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/bb18572d3c4bb94f8a9afc8ea726c90d.json","name":"小汽车_tex.json"},"texPngData":{"url":"http://staging-teach.cdn.ireadabc.com/84bce64cd4259e604a458d08ddd75bec.png","name":"小汽车_tex.png"}},{"gId":"1","data":{"name":"图片","pic":true,"fill":true,"commonProp":true,"copy":true,"color":"#ffde00"},"nickName":"图片","keyArrData":[{"panelGroup":[],"time":0.012}],"isFill":true,"pic_url":"http://staging-teach.cdn.ireadabc.com/35f003bb6d0e410494d606fd4055ddb4.png"},{"gId":"5","data":{"name":"重玩按钮","pic":true,"commonProp":true},"nickName":"重玩按钮","keyArrData":[{"panelGroup":[],"time":5,"y":"0"}],"pic_url":"http://staging-teach.cdn.ireadabc.com/3a552c7843003f6803267a03546db24b.png"},{"gId":"1","data":{"name":"图片","pic":true,"fill":true,"commonProp":true,"copy":true,"color":"#ffde00"},"nickName":"图片","pic_url":"http://staging-teach.cdn.ireadabc.com/c8abf7383d65bcbdba8f390785cece60.png","keyArrData":[{"panelGroup":[],"time":0.637,"x":"-0.2"},{"panelGroup":[],"time":2.25,"x":"-0.2","active":"false"}]}]}}
},
preload() {
......@@ -1103,18 +1103,18 @@ cc.Class({
showJumpKeyData(item, keyData) {
item.active = true;
for( let key in keyData ) {
if (item[key] != null && keyData[key] != null && keyData[key] != '') {
this.setItemPropertyAiClass(item, key, keyData[key])
}
}
if (item.opacity > 0) {
item.active = true;
} else {
item.active = false;
}
// if (item.opacity > 0) {
// item.active = true;
// } else {
// item.active = false;
// }
},
......@@ -1166,17 +1166,18 @@ cc.Class({
this.cleanCurKeyActionArr(item);
}
item.active = true;
for( let key in keyData ) {
if (item[key] != null && keyData[key] != null && keyData[key] != '') {
this.setItemPropertyAiClass(item, key, keyData[key])
}
}
if (item.opacity > 0) {
item.active = true;
} else {
item.active = false;
}
// if (item.opacity > 0) {
// item.active = true;
// } else {
// item.active = false;
// }
const actionArr = [];
......@@ -1208,7 +1209,7 @@ cc.Class({
if (item.curKeyActionArr) {
this.cleanCurKeyActionArr(item);
}
item.active = true;
let animation = item.animationNames[0];
let times = -1;
for( let key in keyData ) {
......@@ -1229,11 +1230,11 @@ cc.Class({
}
}
if (item.opacity > 0) {
item.active = true;
} else {
item.active = false;
}
// if (item.opacity > 0) {
// item.active = true;
// } else {
// item.active = false;
// }
const keyArrData = item.data.keyArrData;
const index = keyArrData.indexOf(keyData);
......@@ -1297,6 +1298,7 @@ cc.Class({
for(let i=0; i<5; i++) {
const groupData = panelGroup[i].data;
const groupItem = item.picNodeArr[i];
groupItem.active = true;
for( let key in groupData ) {
if (groupItem[key] != null && groupData[key] != null && groupData[key] != '') {
this.setItemPropertyAiClass(groupItem, key, groupData[key])
......@@ -1314,11 +1316,11 @@ cc.Class({
}
}
if (groupItem.opacity > 0) {
groupItem.active = true;
} else {
groupItem.active = false;
}
// if (groupItem.opacity > 0) {
// groupItem.active = true;
// } else {
// groupItem.active = false;
// }
}
console.log('~panelGroup: ', panelGroup);
......
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