Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2024-12-23 11:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

trying to fix conflic in ParseTileLayers

Browse source
This commit is contained in:
Svipal 2020-06-06 11:11:43 +02:00
parent b6524e0ac0
commit 9c8cdd4063
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/tilemaps/parsers/tiled/ParseTileLayers.js
View file

@ -128,8 +128,9 @@ var ParseTileLayers = function (json, insertNull)
tileHeight: json.tileheight, tileHeight: json.tileheight,
alpha: (curGroupState.opacity * curl.opacity), alpha: (curGroupState.opacity * curl.opacity),
visible: (curGroupState.visible && curl.visible), visible: (curGroupState.visible && curl.visible),
properties: GetFastValue(curl, 'properties', {}), orientation: CONST.fromOrientationString(json.orientation),
orientation: CONST.fromOrientationString(json.orientation) properties: GetFastValue(curl, 'properties', {})
}); });
if (layerData.orientation === CONST.HEXAGONAL) if (layerData.orientation === CONST.HEXAGONAL)
@ -207,8 +208,9 @@ var ParseTileLayers = function (json, insertNull)
tileHeight: json.tileheight, tileHeight: json.tileheight,
alpha: (curGroupState.opacity * curl.opacity), alpha: (curGroupState.opacity * curl.opacity),
visible: (curGroupState.visible && curl.visible), visible: (curGroupState.visible && curl.visible),
properties: GetFastValue(curl, 'properties', {}), orientation: CONST.fromOrientationString(json.orientation),
orientation: CONST.fromOrientationString(json.orientation) properties: GetFastValue(curl, 'properties', {})
}); });
if (layerData.orientation === CONST.HEXAGONAL) if (layerData.orientation === CONST.HEXAGONAL)