Merge pull request #17786 from AIGRIND-LLC/patch-1

zilongshanren · web-flow · commit 9c2782f80a56 · 2017-05-15T11:37:21.000+08:00
Fix issue #15926
diff --git a/cocos/2d/CCLabel.cpp b/cocos/2d/CCLabel.cpp
@@ -1754,7 +1754,7 @@ Sprite* Label::getLetter(int letterIndex)
         if (_textSprite == nullptr && letterIndex < _lengthOfString)
         {
             const auto &letterInfo = _lettersInfo[letterIndex];
-            if (!letterInfo.valid)
+            if (!letterInfo.valid || letterInfo.atlasIndex<0)
             {
                 break;
             }
diff --git a/cocos/2d/CCLabelTextFormatter.cpp b/cocos/2d/CCLabelTextFormatter.cpp
@@ -382,6 +382,7 @@ void Label::recordLetterInfo(const cocos2d::Vec2& point, char32_t utf32Char, int
     _lettersInfo[letterIndex].valid = _fontAtlas->_letterDefinitions[utf32Char].validDefinition;
     _lettersInfo[letterIndex].positionX = point.x;
     _lettersInfo[letterIndex].positionY = point.y;
+    _lettersInfo[letterIndex].atlasIndex = -1;
 }
 
 void Label::recordPlaceholderInfo(int letterIndex, char32_t utf32Char)

Original file line number	Diff line number	Diff line change
`@@ -1754,7 +1754,7 @@ Sprite* Label::getLetter(int letterIndex)`
`1754`	`1754`	`if (_textSprite == nullptr && letterIndex < _lengthOfString)`
`1755`	`1755`	`{`
`1756`	`1756`	`const auto &letterInfo = _lettersInfo[letterIndex];`
`1757`		`- if (!letterInfo.valid)`
	`1757`	`+ if (!letterInfo.valid \|\| letterInfo.atlasIndex<0)`
`1758`	`1758`	`{`
`1759`	`1759`	`break;`
`1760`	`1760`	`}`
Original file line number	Diff line number	Diff line change
`@@ -382,6 +382,7 @@ void Label::recordLetterInfo(const cocos2d::Vec2& point, char32_t utf32Char, int`
`382`	`382`	`_lettersInfo[letterIndex].valid = _fontAtlas->_letterDefinitions[utf32Char].validDefinition;`
`383`	`383`	`_lettersInfo[letterIndex].positionX = point.x;`
`384`	`384`	`_lettersInfo[letterIndex].positionY = point.y;`
	`385`	`+ _lettersInfo[letterIndex].atlasIndex = -1;`
`385`	`386`	`}`
`386`	`387`
`387`	`388`	`void Label::recordPlaceholderInfo(int letterIndex, char32_t utf32Char)`