Skip to content

Commit 475383d

Browse files
committed
Merge pull request cocos2d#2962 from VisualSJ/develop-a
Fixed a bug that is LayoutComponent position error
2 parents 8048837 + 3dbeda8 commit 475383d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

extensions/cocostudio/loader/parsers/timelineParser-2.x.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,8 +339,8 @@
339339
if(!layoutComponent)
340340
return;
341341

342-
var positionXPercentEnabled = json["PositionPercentXEnable"] || false;
343-
var positionYPercentEnabled = json["PositionPercentYEnable"] || false;
342+
var positionXPercentEnabled = json["PositionPercentXEnable"] || json["PositionPercentXEnabled"] || false;
343+
var positionYPercentEnabled = json["PositionPercentYEnable"] || json["PositionPercentYEnabled"] || false;
344344
var positionXPercent = 0,
345345
positionYPercent = 0,
346346
PrePosition = json["PrePosition"];

0 commit comments

Comments
 (0)