Fixed #3860: Rename plist frame names to avoid name conflicts

Author: pandamicro

tests/SpriteTest/SpriteTest.js

@@ -4708,10 +4708,10 @@ var TextureColorCacheIssue = SpriteTestDemo.extend({
         spriteFrameCache.addSpriteFrames(s_tcc_issue_1_plist, s_tcc_issue_1);
         spriteFrameCache.addSpriteFrames(s_tcc_issue_2_plist, s_tcc_issue_2);
 
-        var grossini = cc.Sprite.createWithSpriteFrameName('grossini_dance_01.png');
+        var grossini = cc.Sprite.createWithSpriteFrameName('tcc_grossini_dance_01.png');
         grossini.setPosition(winSize.width / 3, winSize.height / 2);
 
-        var sister = cc.Sprite.createWithSpriteFrameName('grossinis_sister1.png');
+        var sister = cc.Sprite.createWithSpriteFrameName('tcc_grossinis_sister1.png');
         sister.setPosition(winSize.width / 3 * 2, winSize.height / 2);
 
         this.addChild(grossini);
@@ -4753,10 +4753,10 @@ var TextureColorCacheIssue2 = SpriteTestDemo.extend({
         spriteFrameCache.addSpriteFrames(s_tcc_issue_1_plist, s_tcc_issue_1);
         spriteFrameCache.addSpriteFrames(s_tcc_issue_2_plist, s_tcc_issue_2);
 
-        var grossini = cc.Sprite.createWithSpriteFrameName('grossini_dance_01.png');
+        var grossini = cc.Sprite.createWithSpriteFrameName('tcc_grossini_dance_01.png');
         grossini.setPosition(winSize.width / 3, winSize.height / 2);
 
-        var sister = cc.Sprite.createWithSpriteFrameName('grossinis_sister1.png');
+        var sister = cc.Sprite.createWithSpriteFrameName('tcc_grossinis_sister1.png');
         sister.setPosition(winSize.width / 3 * 2, winSize.height / 2);
 
         this.addChild(grossini);

tests/res/animations/tcc_issue_1.plist

@@ -4,7 +4,7 @@
     <dict>
         <key>frames</key>
         <dict>
-            <key>grossini_dance_01.png</key>
+            <key>tcc_grossini_dance_01.png</key>
             <dict>
                 <key>frame</key>
                 <string>{{2,79},{51,109}}</string>
@@ -17,7 +17,7 @@
                 <key>sourceSize</key>
                 <string>{85,121}</string>
             </dict>
-            <key>grossini_dance_05.png</key>
+            <key>tcc_grossini_dance_05.png</key>
             <dict>
                 <key>frame</key>
                 <string>{{2,2},{75,109}}</string>
@@ -30,7 +30,7 @@
                 <key>sourceSize</key>
                 <string>{85,121}</string>
             </dict>
-            <key>grossini_dance_08.png</key>
+            <key>tcc_grossini_dance_08.png</key>
             <dict>
                 <key>frame</key>
                 <string>{{2,132},{51,109}}</string>

tests/res/animations/tcc_issue_2.plist

@@ -4,7 +4,7 @@
     <dict>
         <key>frames</key>
         <dict>
-            <key>grossini_dance_13.png</key>
+            <key>tcc_grossini_dance_13.png</key>
             <dict>
                 <key>frame</key>
                 <string>{{2,52},{51,109}}</string>
@@ -17,7 +17,7 @@
                 <key>sourceSize</key>
                 <string>{85,121}</string>
             </dict>
-            <key>grossinis_sister1.png</key>
+            <key>tcc_grossinis_sister1.png</key>
             <dict>
                 <key>frame</key>
                 <string>{{2,2},{48,113}}</string>
@@ -30,7 +30,7 @@
                 <key>sourceSize</key>
                 <string>{52,139}</string>
             </dict>
-            <key>grossinis_sister2.png</key>
+            <key>tcc_grossinis_sister2.png</key>
             <dict>
                 <key>frame</key>
                 <string>{{2,105},{54,126}}</string>