mirror of
https://github.com/photonstorm/phaser
synced 2024-12-23 03:23:42 +00:00
trying to fix conflic in ParseTileLayers
This commit is contained in:
parent
b6524e0ac0
commit
9c8cdd4063
1 changed files with 6 additions and 4 deletions
|
@ -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)
|
||||||
|
|
Loading…
Reference in a new issue