Skip to content

Commit c8f3cd9

Browse files
committed
issue cocos2d#3251 Fixed bug of armature that it display wrong when set content scale.
1 parent 3c2b184 commit c8f3cd9

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

extensions/CocoStudio/Armature/utils/CCDataReaderHelper.js

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -715,16 +715,20 @@ ccs.DataReaderHelper.decodeBoneDisplayFromJson = function (json, dataInfo) {
715715
var dicArray = json[ccs.CONST_SKIN_DATA]|| [];
716716
var dic = dicArray[0];
717717
if(dic){
718-
displayData.skinData.x = (dic[ccs.CONST_A_X]|| 0) * this._positionReadScale;
719-
displayData.skinData.y = (dic[ccs.CONST_A_Y]||0) * this._positionReadScale;
718+
var skinData = displayData.skinData;
719+
skinData.x = (dic[ccs.CONST_A_X]|| 0) * this._positionReadScale;
720+
skinData.y = (dic[ccs.CONST_A_Y]||0) * this._positionReadScale;
720721
if(dic.hasOwnProperty(ccs.CONST_A_SCALE_X)){
721-
displayData.skinData.scaleX = dic[ccs.CONST_A_SCALE_X];
722+
skinData.scaleX = dic[ccs.CONST_A_SCALE_X];
722723
}
723724
if(dic.hasOwnProperty(ccs.CONST_A_SCALE_Y)){
724-
displayData.skinData.scaleY = dic[ccs.CONST_A_SCALE_Y];
725+
skinData.scaleY = dic[ccs.CONST_A_SCALE_Y];
725726
}
726-
displayData.skinData.skewX = dic[ccs.CONST_A_SKEW_X]|| 0;
727-
displayData.skinData.skewY = dic[ccs.CONST_A_SKEW_Y]||0;
727+
skinData.skewX = dic[ccs.CONST_A_SKEW_X]|| 0;
728+
skinData.skewY = dic[ccs.CONST_A_SKEW_Y]||0;
729+
730+
skinData.x *= dataInfo.contentScale;
731+
skinData.y *= dataInfo.contentScale;
728732
dic = null;
729733
}
730734
break;

0 commit comments

Comments
 (0)