Skip to content
This repository was archived by the owner on Aug 10, 2021. It is now read-only.

Commit 9e01015

Browse files
author
SeanLin
committed
Merge pull request cocos2d#584 from dingpinglv/iss1509_UpdateMenuTest
fixed cocos2d#1509 correct bug of cc.Follow
2 parents 3e05fc5 + b4c2c36 commit 9e01015

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

cocos2d/actions/CCAction.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ cc.Follow = cc.Action.extend(/** @lends cc.Follow# */{
367367
rect = rect || cc.RectZero();
368368
this._followedNode = followedNode;
369369

370-
this._boundarySet = cc.Rect.CCRectEqualToRect(rect, cc.RectZero());
370+
this._boundarySet = !cc.Rect.CCRectEqualToRect(rect, cc.RectZero());
371371

372372
this._boundaryFullyCovered = false;
373373

cocos2d/label_nodes/CCLabelAtlas.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ cc.LabelAtlas = cc.AtlasNode.extend(/** @lends cc.LabelAtlas# */{
5454
textureFilename = arg[1];
5555
width = arg[2];
5656
height = arg[3];
57-
startChar = String.fromCharCode(arg[4]);
57+
//startChar = String.fromCharCode(arg[4]);
58+
startChar = arg[4];
5859
cc.Assert(label !== null, "Label must be non-nil");
5960
}
6061

0 commit comments

Comments
 (0)