Merge pull request #1381 from danielgronlund/atlas-assets-fix

s1ddok · s1ddok · commit a21066457279 · 2016-05-22T13:11:20.000+04:00
Fixes atlas asset loading bug.
diff --git a/cocos2d/CCSpriteFrameCache.m b/cocos2d/CCSpriteFrameCache.m
@@ -445,7 +445,7 @@ -(void) addSpriteFramesFromSpriteAtlasAssetNamed:(NSString *)atlasAssetName
         
         if (indexes.count == 0) {
             // Falling back to using @1x graphics if the expected resolution is not found.
-            [indexes addIndexes:[self indexesForImagePaths:imagePaths forFilename:atlasAssetName withSuffix:nil]];
+            [indexes addIndexes:[self indexesForImagePaths:imagePaths forFilename:atlasAssetName withSuffix:@""]];
             scaleSuffix = nil;
         }
         

Original file line number	Diff line number	Diff line change
`@@ -445,7 +445,7 @@ -(void) addSpriteFramesFromSpriteAtlasAssetNamed:(NSString *)atlasAssetName`
`445`	`445`
`446`	`446`	`if (indexes.count == 0) {`
`447`	`447`	`// Falling back to using @1x graphics if the expected resolution is not found.`
`448`		`- [indexes addIndexes:[self indexesForImagePaths:imagePaths forFilename:atlasAssetName withSuffix:nil]];`
	`448`	`+ [indexes addIndexes:[self indexesForImagePaths:imagePaths forFilename:atlasAssetName withSuffix:@""]];`
`449`	`449`	`scaleSuffix = nil;`
`450`	`450`	`}`
`451`	`451`