Merge branch 'develop'

PhaserEditor2D · Oct 31, 2020 · 99f4985 · 99f4985
2 parents d6a508c + 8259e2f
commit 99f4985
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 23 deletions.
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -15,7 +15,7 @@
 * User components editor: shows the context menu in the Outline view.
 * Scene Editor: allows writing an expression in property fields.
 * New Sunny Land project template, based on Tiled maps.
-* Scene Editor: Tilemap, StaticTilemapLayer and DynamicTilemapLayer support.
+* Scene Editor:Tilemap, StaticTilemapLayer and DynamicTilemapLayer support.
 
 ### Removed
 

diff --git a/source/editor/plugins/phasereditor2d.pack/src/AssetPackPlugin.ts b/source/editor/plugins/phasereditor2d.pack/src/AssetPackPlugin.ts
@@ -120,6 +120,10 @@ namespace phasereditor2d.pack {
                         iconName: ICON_ANIMATIONS,
                         contentType: core.contentTypes.CONTENT_TYPE_ANIMATIONS
                     },
+                    {
+                        iconName: ICON_TILEMAP,
+                        contentType: core.contentTypes.CONTENT_TYPE_TILEMAP_TILED_JSON
+                    },
                     {
                         plugin: webContentTypes.WebContentTypesPlugin.getInstance(),
                         iconName: webContentTypes.ICON_FILE_FONT,

diff --git a/...rs/Phaser Editor 2D/Demo - JavaScript - Sunny Land (Tilemap)/files/assets/scenes/Level.js b/...rs/Phaser Editor 2D/Demo - JavaScript - Sunny Land (Tilemap)/files/assets/scenes/Level.js
@@ -34,10 +34,6 @@ class Level extends Phaser.Scene {
 		const map = this.add.tilemap("map");
 		map.addTilesetImage("tileset", "tileset");
 
-		// map_1
-		const map_1 = this.add.tilemap("map");
-		map_1.addTilesetImage("tileset", "tileset");
-
 		// back3
 		const back3 = this.add.image(0, 0, "back");
 		back3.setOrigin(0, 0);
@@ -232,7 +228,6 @@ class Level extends Phaser.Scene {
 		this.right_button = right_button;
 		this.jump_button = jump_button;
 		this.map = map;
-		this.map_1 = map_1;
 		this.items = items;
 		this.enemies = enemies;
 	}

diff --git a/...Phaser Editor 2D/Demo - JavaScript - Sunny Land (Tilemap)/files/assets/scenes/Level.scene b/...Phaser Editor 2D/Demo - JavaScript - Sunny Land (Tilemap)/files/assets/scenes/Level.scene
@@ -468,18 +468,6 @@
                     "imageKey": "tileset"
                 }
             ]
-        },
-        {
-            "id": "a1061f1d-0479-4a10-839f-294ee33c167e",
-            "type": "Tilemap",
-            "label": "map_1",
-            "key": "map",
-            "tilesets": [
-                {
-                    "name": "tileset",
-                    "imageKey": "tileset"
-                }
-            ]
         }
     ],
     "meta": {

diff --git a/...mplates/providers/Phaser Editor 2D/Demo - JavaScript - Sunny Land (Tilemap)/files/main.js b/...mplates/providers/Phaser Editor 2D/Demo - JavaScript - Sunny Land (Tilemap)/files/main.js
@@ -25,11 +25,6 @@ window.addEventListener('load', function () {
 	});
 
 	game.scene.add("Boot", Boot, true);
-
-	document.body.addEventListener("pointerdown", () => {
-
-		game.scale.startFullscreen();
-	});
 });
 
 class Boot extends Phaser.Scene {