Merge pull request cocos#640 from xunyi0/master

修正 FAQ 加载 DragonBones 部分代码
zifichai · Oct 9, 2018 · 3405f20 · 3405f20
2 parents bcae6ad + c7786d4
commit 3405f20
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/en/getting-started/faq.md b/en/getting-started/faq.md
@@ -58,21 +58,21 @@ let dragonDisplay = animNode.addComponent(dragonBones.ArmatureDisplay);
 let image = 'http://localhost:7456/res/raw-assets/eee_tex-1529064342.png';
 let ske = 'http://localhost:7456/res/raw-assets/eee_ske-1529065642.json';
 let atlas = 'http://localhost:7456/res/raw-assets/eee_tex-1529065642.json';
-cc.loader.load(image, () => {
+cc.loader.load(image, (error, texture) => {
     cc.loader.load({ url: atlas, type: 'txt' }, (error, atlasJson) => {
         cc.loader.load({ url: ske, type: 'txt' }, (error, dragonBonesJson) => {
             let atlas = new dragonBones.DragonBonesAtlasAsset();
             atlas.atlasJson = atlasJson;
-            atlas.texture = image;
+            atlas.texture = texture;
 
             let asset = new dragonBones.DragonBonesAsset();
             asset.dragonBonesJson = dragonBonesJson;
 
             dragonDisplay.dragonAtlasAsset = atlas;
             dragonDisplay.dragonAsset = asset;
 
-            dragonDisplay.armatureName = 'eee';
-            dragonDisplay.playAnimation('eee', -1);
+            dragonDisplay.armatureName = 'box_anim';
+            dragonDisplay.playAnimation('box_anim', 0);
         });
     });
 });

diff --git a/zh/getting-started/faq.md b/zh/getting-started/faq.md
@@ -59,21 +59,21 @@ let dragonDisplay = animNode.addComponent(dragonBones.ArmatureDisplay);
 let image = 'http://localhost:7456/res/raw-assets/eee_tex-1529064342.png';
 let ske = 'http://localhost:7456/res/raw-assets/eee_ske-1529065642.json';
 let atlas = 'http://localhost:7456/res/raw-assets/eee_tex-1529065642.json';
-cc.loader.load(image, () => {
+cc.loader.load(image, (error, texture) => {
     cc.loader.load({ url: atlas, type: 'txt' }, (error, atlasJson) => {
         cc.loader.load({ url: ske, type: 'txt' }, (error, dragonBonesJson) => {
             let atlas = new dragonBones.DragonBonesAtlasAsset();
             atlas.atlasJson = atlasJson;
-            atlas.texture = image;
+            atlas.texture = texture;
 
             let asset = new dragonBones.DragonBonesAsset();
             asset.dragonBonesJson = dragonBonesJson;
 
             dragonDisplay.dragonAtlasAsset = atlas;
             dragonDisplay.dragonAsset = asset;
 
-            dragonDisplay.armatureName = 'eee';
-            dragonDisplay.playAnimation('eee', -1);
+            dragonDisplay.armatureName = 'box_anim';
+            dragonDisplay.playAnimation('box_anim', 0);
         });
     });
 });