Skip to content

issue #3192 fixed some bug for cocostudio reader #1254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 20, 2013
Merged

issue #3192 fixed some bug for cocostudio reader #1254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
164 changes: 23 additions & 141 deletions extensions/CocoStudio/Reader/GUIReader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,26 +370,6 @@ ccs.WidgetPropertiesReader0250 = ccs.WidgetPropertiesReader.extend({
}

this.setColorPropsForWidgetFromJsonDictionary(widget, options);

this.setPropsForWidgetFromJsonDictionary(widget, options);
var checkBox = widget;

var backGroundDic = options["backGroundBoxData"];
var backGroundType = backGroundDic["resourceType"];
switch (backGroundType) {
case 0:
var backGroundFileName = backGroundDic["path"];
var backGroundFileName_tp = backGroundFileName ? this._filePath + backGroundFileName : null;
checkBox.loadTextureBackGround(backGroundFileName_tp);
break;
case 1:
var backGroundFileName = backGroundDic["path"];
checkBox.loadTextureBackGround(backGroundFileName, ccs.TextureResType.plist);
break;
default:
break;
}
backGroundDic = null;
},

setPropsForImageViewFromJsonDictionary: function (widget, options) {
Expand Down Expand Up @@ -545,7 +525,7 @@ ccs.WidgetPropertiesReader0250 = ccs.WidgetPropertiesReader.extend({


setPropsForScrollViewFromJsonDictionary: function (widget, options) {
this.setPropsForPanelFromJsonDictionary(widget, options);
this.setPropsForLayoutFromJsonDictionary(widget, options);
var scrollView = widget;
var innerWidth = options["innerWidth"];
var innerHeight = options["innerHeight"];
Expand All @@ -566,121 +546,6 @@ ccs.WidgetPropertiesReader0250 = ccs.WidgetPropertiesReader.extend({
this.setColorPropsForWidgetFromJsonDictionary(widget, options);
},

setPropsForPanelFromJsonDictionary: function (widget, options) {
if (this._olderVersion) {
this.setPropsForContainerWidgetFromJsonDictionary(widget, options);
var panel = widget;
var backGroundScale9Enable = options["backGroundScale9Enable"];
panel.setBackGroundImageScale9Enabled(backGroundScale9Enable);
var cr = options["bgColorR"];
var cg = options["bgColorG"];
var cb = options["bgColorB"];

var scr = options["bgStartColorR"];
var scg = options["bgStartColorG"];
var scb = options["bgStartColorB"];

var ecr = options["bgEndColorR"];
var ecg = options["bgEndColorG"];
var ecb = options["bgEndColorB"];

var bgcv1 = options["vectorX"];
var bgcv2 = options["vectorY"];
panel.setBackGroundColorVector(cc.p(bgcv1, bgcv2));

var co = options["bgColorOpacity"];

var colorType = options["colorType"];
panel.setBackGroundColorType(colorType);
panel.setBackGroundColor(cc.c3b(scr, scg, scb), cc.c3b(ecr, ecg, ecb));
panel.setBackGroundColor(cc.c3b(cr, cg, cb));
panel.setBackGroundColorOpacity(co);

var imageFileName = options["backGroundImage"];
var imageFileName_tp = imageFileName ? this._filePath + imageFileName : null;
var useMergedTexture = options["useMergedTexture"];
if (backGroundScale9Enable) {
var cx = options["capInsetsX"];
var cy = options["capInsetsY"];
var cw = options["capInsetsWidth"];
var ch = options["capInsetsHeight"];
if (useMergedTexture) {
panel.setBackGroundImage(imageFileName, ccs.TextureResType.plist);
}
else {
panel.setBackGroundImage(imageFileName_tp);
}
panel.setBackGroundImageCapInsets(cc.rect(cx, cy, cw, ch));
}
else {

if (useMergedTexture) {
panel.setBackGroundImage(imageFileName, ccs.TextureResType.plist);
}
else {
panel.setBackGroundImage(imageFileName_tp);
}
}
this.setColorPropsForWidgetFromJsonDictionary(widget, options);
}
else {
this.setPropsForContainerWidgetFromJsonDictionary(widget, options);
var panel = widget;
var backGroundScale9Enable = options["backGroundScale9Enable"];
panel.setBackGroundImageScale9Enabled(backGroundScale9Enable);
var cr = options["bgColorR"];
var cg = options["bgColorG"]
var cb = options["bgColorB"];

var scr = options["bgStartColorR"];
var scg = options["bgStartColorG"]
var scb = options["bgStartColorB"];

var ecr = options["bgEndColorR"];
var ecg = options["bgEndColorG"];
var ecb = options["bgEndColorB"];

var bgcv1 = options["vectorX"];
var bgcv2 = options["vectorY"];
panel.setBackGroundColorVector(cc.p(bgcv1, bgcv2));

var co = options["bgColorOpacity"];

var colorType = options["colorType"];
panel.setBackGroundColorType(colorType);
panel.setBackGroundColor(cc.c3b(scr, scg, scb), cc.c3b(ecr, ecg, ecb));
panel.setBackGroundColor(cc.c3b(cr, cg, cb));
panel.setBackGroundColorOpacity(co);


var imageFileNameDic = options["backGroundImageData"] || {};
var imageFileNameType = imageFileNameDic["resourceType"];
switch (imageFileNameType) {
case 0:
var imageFileName = imageFileNameDic["path"];
var imageFileName_tp = imageFileName ? this._filePath + imageFileName : null;
panel.setBackGroundImage(imageFileName_tp);
break;
case 1:
var imageFileName = imageFileNameDic["path"];
panel.setBackGroundImage(imageFileName, ccs.TextureResType.plist);
break;
default:
break;
}
imageFileNameDic = null;

if (backGroundScale9Enable) {
var cx = options["capInsetsX"];
var cy = options["capInsetsY"];
var cw = options["capInsetsWidth"];
var ch = options["capInsetsHeight"];
panel.setBackGroundImageCapInsets(cc.rect(cx, cy, cw, ch));
}
this.setColorPropsForWidgetFromJsonDictionary(widget, options);
}
},

setPropsForSliderFromJsonDictionary: function (widget, options) {

this.setPropsForWidgetFromJsonDictionary(widget, options);
Expand Down Expand Up @@ -844,8 +709,8 @@ ccs.WidgetPropertiesReader0250 = ccs.WidgetPropertiesReader.extend({
},

setPropsForPageViewFromJsonDictionary: function (widget, options) {
this.setPropsForPanelFromJsonDictionary(widget, options);
this.setColorPropsForWidgetFromJsonDictionary(widget, options);
/* this.setPropsForPanelFromJsonDictionary(widget, options);
this.setColorPropsForWidgetFromJsonDictionary(widget, options);*/
},

setPropsForLabelBMFontFromJsonDictionary: function (widget, options) {
Expand Down Expand Up @@ -1156,7 +1021,24 @@ ccs.WidgetPropertiesReader0300 = ccs.WidgetPropertiesReader.extend({
},

setPropsForCheckBoxFromJsonDictionary: function (widget, options) {
this.setPropsForWidgetFromJsonDictionary(widget, options);
var checkBox = widget;
var backGroundDic = options["backGroundBoxData"];
var backGroundType = backGroundDic["resourceType"];
switch (backGroundType) {
case 0:
var backGroundFileName = backGroundDic["path"];
var backGroundFileName_tp = backGroundFileName ? this._filePath + backGroundFileName : null;
checkBox.loadTextureBackGround(backGroundFileName_tp);
break;
case 1:
var backGroundFileName = backGroundDic["path"];
checkBox.loadTextureBackGround(backGroundFileName, ccs.TextureResType.plist);
break;
default:
break;
}
backGroundDic = null;
var backGroundSelectedDic = options["backGroundBoxSelectedData"];
var backGroundSelectedType = backGroundSelectedDic["resourceType"];
switch (backGroundSelectedType) {
Expand Down Expand Up @@ -1393,7 +1275,7 @@ ccs.WidgetPropertiesReader0300 = ccs.WidgetPropertiesReader.extend({


setPropsForScrollViewFromJsonDictionary: function (widget, options) {
this.setPropsForPanelFromJsonDictionary(widget, options);
this.setPropsForLayoutFromJsonDictionary(widget, options);
var scrollView = widget;
var innerWidth = options["innerWidth"];
var innerHeight = options["innerHeight"];
Expand Down Expand Up @@ -1656,8 +1538,8 @@ ccs.WidgetPropertiesReader0300 = ccs.WidgetPropertiesReader.extend({
},

setPropsForPageViewFromJsonDictionary: function (widget, options) {
this.setPropsForPanelFromJsonDictionary(widget, options);
this.setColorPropsForWidgetFromJsonDictionary(widget, options);
/*this.setPropsForPanelFromJsonDictionary(widget, options);
this.setColorPropsForWidgetFromJsonDictionary(widget, options);*/
},

setPropsForLabelBMFontFromJsonDictionary: function (widget, options) {
Expand Down
10 changes: 5 additions & 5 deletions extensions/CocoStudio/Reader/SceneReader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,11 +237,11 @@ ccs.SceneReader = cc.Class.extend({
var attribute = null;
if (resType == 0) {
attribute = ccs.ComAttribute.create();
var size = 0;
var data = 0;
data = cc.FileUtils.getInstance().getTextFileData(path);
if (data) {
attribute.setDict(JSON.parse(data));
if(this._baseBath!=path){
var data = cc.FileUtils.getInstance().getTextFileData(path);
if (data) {
attribute.setDict(JSON.parse(data));
}
}
}
else {
Expand Down