Commit c88a8908 authored by Lwd's avatar Lwd

commit

parent cc807d03
This diff is collapsed.
...@@ -155,6 +155,10 @@ var game = cc.Class({ ...@@ -155,6 +155,10 @@ var game = cc.Class({
this.OptionType = g.data_mgr.getSheepfoldArr().length - 3; this.OptionType = g.data_mgr.getSheepfoldArr().length - 3;
}, },
getOptionType: function () {
return this.OptionType;
},
//更新界面信息 //更新界面信息
UpdataUi: function () { UpdataUi: function () {
//设置目标节点类型 //设置目标节点类型
......
...@@ -96,17 +96,35 @@ cc.Class({ ...@@ -96,17 +96,35 @@ cc.Class({
} }
g.speaker.inst.play_good(); g.speaker.inst.play_good();
var newItem_temp = cc.instantiate(g.game.inst.Item_0[2]); if (g.game.inst.getOptionType() == 2) {
// newItem_temp.scale = 0.8;
// this.node.scale = this.node.scale * 0.8;
var newItem_temp = cc.instantiate(g.game.inst.Item_0[3]);
} else {
var newItem_temp = cc.instantiate(g.game.inst.Item_0[2]);
}
// var newItem_temp = cc.instantiate(g.game.inst.Item_0[2]);
content.getChildByName("db").active = true; content.getChildByName("db").active = true;
content.getChildByName("db").getComponent(dragonBones.ArmatureDisplay).playAnimation("newAnimation", 1); content.getChildByName("db").getComponent(dragonBones.ArmatureDisplay).playAnimation("newAnimation", 1);
if (this.node.width >= 150) { if (this.node.width >= 150) {
this.node.scale = 0.6; if (g.game.inst.getOptionType() == 2) {
this.node.x = 0; this.node.scale = 0.45;
} this.node.x = 0;
if (g.game.inst.OptionType == 2) { } else {
this.node.scale = this.node.scale * 0.8; this.node.scale = 0.6;
this.node.x = 0;
}
} else {
if (g.game.inst.getOptionType() == 2) {
this.node.scale = 0.7;
this.node.x = 0;
} else {
this.node.scale = 0.9;
this.node.x = 0;
}
} }
this.node.parent = newItem_temp; this.node.parent = newItem_temp;
newItem_temp.parent = content.getChildByName("scrollView").getChildByName("view").getChildByName("content"); newItem_temp.parent = content.getChildByName("scrollView").getChildByName("view").getChildByName("content");
......
...@@ -14,7 +14,7 @@ g.data_mgr = { ...@@ -14,7 +14,7 @@ g.data_mgr = {
{ "id": "1623738000162o9u566", "word": "标题2" }, { "id": "1623738000162o9u566", "word": "标题2" },
{ "id": "3", "word": "标题3" }, { "id": "3", "word": "标题3" },
{ "id": "4", "word": "标题4" }, { "id": "4", "word": "标题4" },
// { "id": "4", "word": "标题4" }, { "id": "4", "word": "标题4" },
// { "id": "4", "word": "标题4" } // { "id": "4", "word": "标题4" }
], ],
"sheepArr": [ "sheepArr": [
...@@ -26,29 +26,27 @@ g.data_mgr = { ...@@ -26,29 +26,27 @@ g.data_mgr = {
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, { "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, // { "word": "4", "sheepfoldId": "4", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, // { "word": "4", "sheepfoldId": "4", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, // { "word": "4", "sheepfoldId": "4", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, // { "word": "4", "sheepfoldId": "4", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, // { "word": "4", "sheepfoldId": "4", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, // { "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, // { "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, // { "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, // { "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, // { "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, // { "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, // { "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, // { "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, // { "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, // { "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, // { "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, // { "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, // { "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, // { "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, // { "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "word": "3", "sheepfoldId": "3", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" },
{ "sheepfoldId": "1623738000162o9u566", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png", "word": "fgsdfg" }, { "sheepfoldId": "1623738000162o9u566", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png", "word": "fgsdfg" },
{ "sheepfoldId": "162373800016117r8ti", "picUrl": "http://staging-teach.cdn.ireadabc.com/77d34b5a7f2895e9319d4485a84a1b2b.png", "word": "gdfa" }], { "sheepfoldId": "162373800016117r8ti", "picUrl": "http://staging-teach.cdn.ireadabc.com/77d34b5a7f2895e9319d4485a84a1b2b.png", "word": "gdfa" }],
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
"premultiplyAlpha": true, "premultiplyAlpha": true,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 154, "width": 120,
"height": 86, "height": 63,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"item_bg2": { "item_bg2": {
......
{ {
"last-module-event-record-time": 1623132204392, "last-module-event-record-time": 1635251397112,
"migrate-history": [ "migrate-history": [
"cloud-function" "cloud-function"
], ],
......
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