Merge branch 'dev' of https://github.com/DragonBones/DragonBonesJS in…

…to dev
DragonBones · Jun 23, 2018 · 987ba96 · 987ba96 · anderpang · Sep 19, 2018
2 parents c76f571 + 6b4692e
commit 987ba96
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/DragonBones/src/dragonBones/core/DragonBones.ts b/DragonBones/src/dragonBones/core/DragonBones.ts
@@ -353,10 +353,6 @@ namespace dragonBones {
     }
 }
 //
-if (typeof global === "undefined") {
-    var global = window as any;
-}
-//
 if (!console.warn) {
     console.warn = function () { };
 }
@@ -381,4 +377,21 @@ var __extends: any = function (t: any, e: any) {
         }
     }
     r.prototype = e.prototype, t.prototype = new (r as any)();
-};
+};
+//
+if (typeof global === "undefined") {
+    var global = window as any;
+}
+//
+declare var exports: any;
+declare var module: any;
+declare var define: any;
+if (typeof exports === "object" && typeof module === "object") {
+    module.exports = dragonBones;
+}
+else if (typeof define === "function" && define["amd"]) {
+    define(["dragonBones"], function () { return dragonBones; });
+}
+else if (typeof exports === "object") {
+    exports["dragonBones"] = dragonBones;
+}
diff --git a/Pixi/4.x/src/dragonBones/pixi/PixiTextureAtlasData.ts b/Pixi/4.x/src/dragonBones/pixi/PixiTextureAtlasData.ts
@@ -80,8 +80,8 @@ namespace dragonBones {
 
                     textureData.renderTexture = new PIXI.Texture(
                         this._renderTexture,
-                        <any>textureData.region as PIXI.Rectangle, // No need to set frame.
-                        <any>textureData.region as PIXI.Rectangle,
+                        new PIXI.Rectangle(textureData.region.x, textureData.region.y, textureData.region.width, textureData.region.height),
+                        new PIXI.Rectangle(textureData.region.x, textureData.region.y, textureData.region.width, textureData.region.height),
                         new PIXI.Rectangle(0, 0, textureData.region.width, textureData.region.height),
                         textureData.rotated as any // .d.ts bug
                     );