diff --git a/demo/resource/assets/isometric_grass_and_water.json b/demo/resource/assets/isometric_grass_and_water.json deleted file mode 100644 index 59c941e2..00000000 --- a/demo/resource/assets/isometric_grass_and_water.json +++ /dev/null @@ -1,345 +0,0 @@ -{ "height":25, - "infinite":false, - "layers":[ - { - "data":[24, 24, 23, 11, 19, 19, 12, 23, 24, 24, 23, 7, 2, 2, 1, 4, 2, 2, 3, 4, 4, 1, 3, 4, 1, 24, 23, 23, 14, 3, 3, 8, 12, 24, 24, 18, 4, 1, 3, 1, 3, 3, 4, 4, 1, 3, 1, 4, 3, 4, 11, 15, 15, 7, 1, 4, 3, 20, 23, 11, 7, 2, 1, 3, 1, 3, 4, 4, 3, 2, 2, 3, 4, 2, 1, 18, 4, 3, 2, 2, 4, 3, 8, 12, 18, 2, 4, 4, 3, 3, 1, 4, 2, 1, 4, 4, 4, 1, 1, 1, 14, 2, 1, 4, 2, 1, 4, 2, 8, 7, 5, 17, 6, 3, 3, 3, 4, 3, 4, 4, 3, 2, 4, 3, 4, 10, 6, 2, 1, 4, 4, 1, 3, 4, 3, 8, 12, 10, 6, 2, 1, 1, 1, 1, 2, 1, 4, 2, 1, 1, 24, 18, 1, 2, 4, 3, 3, 5, 6, 5, 13, 9, 11, 7, 3, 4, 1, 3, 1, 3, 4, 2, 4, 4, 4, 24, 14, 4, 2, 5, 6, 2, 8, 22, 9, 23, 24, 10, 6, 2, 1, 3, 1, 5, 6, 2, 3, 4, 4, 2, 19, 7, 3, 1, 8, 7, 4, 1, 8, 12, 24, 23, 23, 10, 17, 6, 3, 1, 8, 7, 1, 3, 3, 3, 1, 1, 2, 4, 2, 2, 3, 3, 4, 3, 20, 24, 23, 23, 23, 23, 18, 2, 2, 3, 1, 4, 4, 1, 1, 1, 3, 3, 5, 13, 6, 1, 2, 2, 5, 9, 23, 23, 24, 23, 24, 14, 1, 3, 1, 1, 3, 3, 4, 4, 4, 2, 4, 16, 24, 10, 6, 2, 4, 20, 23, 23, 24, 23, 23, 24, 14, 2, 4, 2, 4, 5, 6, 4, 3, 1, 3, 1, 20, 23, 24, 10, 6, 3, 8, 12, 24, 23, 23, 23, 24, 14, 1, 2, 1, 5, 9, 18, 4, 3, 4, 4, 2, 8, 12, 23, 24, 18, 4, 3, 16, 24, 24, 24, 23, 24, 18, 1, 3, 1, 16, 24, 14, 1, 3, 2, 4, 1, 2, 8, 12, 24, 14, 4, 1, 8, 15, 12, 24, 23, 11, 7, 2, 1, 2, 16, 23, 18, 1, 4, 2, 3, 4, 3, 2, 8, 19, 7, 2, 2, 3, 3, 8, 15, 19, 7, 3, 1, 2, 5, 9, 24, 14, 1, 2, 3, 2, 2, 1, 4, 4, 1, 2, 5, 6, 2, 2, 2, 1, 3, 4, 3, 5, 13, 9, 24, 24, 18, 4, 3, 4, 1, 4, 1, 3, 2, 5, 13, 9, 14, 3, 1, 3, 2, 4, 4, 5, 21, 19, 12, 24, 11, 7, 1, 2, 3, 2, 1, 3, 3, 3, 20, 23, 24, 18, 4, 4, 2, 3, 1, 1, 8, 7, 5, 9, 23, 18, 1, 3, 4, 2, 4, 2, 4, 1, 2, 8, 15, 19, 7, 4, 5, 6, 4, 2, 4, 5, 17, 9, 23, 11, 22, 13, 6, 4, 1, 3, 2, 2, 4, 4, 3, 2, 1, 4, 2, 8, 7, 4, 2, 3, 16, 24, 23, 11, 7, 16, 23, 18, 3, 1, 1, 3, 1, 2, 3, 3, 3, 4, 2, 1, 3, 2, 3, 4, 3, 8, 15, 15, 7, 4, 8, 19, 7, 3, 4, 1, 2, 3, 4, 1, 3, 4, 4, 4, 1, 4, 4, 3, 2, 3, 4, 1, 2, 4, 2, 1, 2, 2, 4, 1, 4, 2, 3, 2, 1, 4, 2, 2, 1, 2, 2, 2, 4, 3, 3, 2, 3, 3, 2, 3, 2, 4, 1, 3, 1, 1, 1, 1, 4, 1, 3, 3, 2, 1, 4, 2, 1, 3, 1, 3, 3, 4, 3, 4, 2, 1, 2, 3, 1, 1], - "height":25, - "id":1, - "name":"Tile Layer 1", - "opacity":1, - "type":"tilelayer", - "visible":true, - "width":25, - "x":0, - "y":0 - }], - "nextlayerid":2, - "nextobjectid":1, - "orientation":"isometric", - "renderorder":"right-down", - "tiledversion":"1.2.1", - "tileheight":32, - "tilesets":[ - { - "columns":4, - "firstgid":1, - "grid": - { - "height":32, - "orientation":"isometric", - "width":64 - }, - "image":"isometric_grass_and_water.png", - "imageheight":384, - "imagewidth":256, - "margin":0, - "name":"isometric_grass_and_water", - "spacing":0, - "terrains":[ - { - "name":"Grass", - "tile":0 - }, - { - "name":"Water", - "tile":22 - }], - "tilecount":24, - "tileheight":64, - "tileoffset": - { - "x":0, - "y":16 - }, - "tiles":[ - { - "id":0, - "terrain":[0, 0, 0, 0] - }, - { - "id":1, - "terrain":[0, 0, 0, 0] - }, - { - "id":2, - "terrain":[0, 0, 0, 0] - }, - { - "id":3, - "terrain":[0, 0, 0, 0] - }, - { - "id":4, - "terrain":[0, 0, 0, 1] - }, - { - "id":5, - "terrain":[0, 0, 1, 0] - }, - { - "id":6, - "terrain":[1, 0, 0, 0] - }, - { - "id":7, - "terrain":[0, 1, 0, 0] - }, - { - "id":8, - "terrain":[0, 1, 1, 1] - }, - { - "id":9, - "terrain":[1, 0, 1, 1] - }, - { - "id":10, - "terrain":[1, 1, 1, 0] - }, - { - "id":11, - "terrain":[1, 1, 0, 1] - }, - { - "id":12, - "terrain":[0, 0, 1, 1] - }, - { - "id":13, - "terrain":[1, 0, 1, 0] - }, - { - "id":14, - "terrain":[1, 1, 0, 0] - }, - { - "id":15, - "terrain":[0, 1, 0, 1] - }, - { - "id":16, - "terrain":[0, 0, 1, 1] - }, - { - "id":17, - "terrain":[1, 0, 1, 0] - }, - { - "id":18, - "terrain":[1, 1, 0, 0] - }, - { - "id":19, - "terrain":[0, 1, 0, 1] - }, - { - "id":20, - "terrain":[0, 1, 1, 0] - }, - { - "id":21, - "terrain":[1, 0, 0, 1] - }, - { - "id":22, - "terrain":[1, 1, 1, 1] - }, - { - "id":23, - "terrain":[1, 1, 1, 1] - }], - "tilewidth":64, - "wangsets":[ - { - "cornercolors":[ - { - "color":"#8ab022", - "name":"Grass", - "probability":1, - "tile":0 - }, - { - "color":"#378dc2", - "name":"Water", - "probability":1, - "tile":23 - }], - "edgecolors":[], - "name":"Grass and Water", - "tile":15, - "wangtiles":[ - { - "dflip":false, - "hflip":false, - "tileid":0, - "vflip":false, - "wangid":[0, 1, 0, 1, 0, 1, 0, 1] - }, - { - "dflip":false, - "hflip":false, - "tileid":1, - "vflip":false, - "wangid":[0, 1, 0, 1, 0, 1, 0, 1] - }, - { - "dflip":false, - "hflip":false, - "tileid":2, - "vflip":false, - "wangid":[0, 1, 0, 1, 0, 1, 0, 1] - }, - { - "dflip":false, - "hflip":false, - "tileid":3, - "vflip":false, - "wangid":[0, 1, 0, 1, 0, 1, 0, 1] - }, - { - "dflip":false, - "hflip":false, - "tileid":4, - "vflip":false, - "wangid":[0, 1, 0, 2, 0, 1, 0, 1] - }, - { - "dflip":false, - "hflip":false, - "tileid":5, - "vflip":false, - "wangid":[0, 1, 0, 1, 0, 2, 0, 1] - }, - { - "dflip":false, - "hflip":false, - "tileid":6, - "vflip":false, - "wangid":[0, 1, 0, 1, 0, 1, 0, 2] - }, - { - "dflip":false, - "hflip":false, - "tileid":7, - "vflip":false, - "wangid":[0, 2, 0, 1, 0, 1, 0, 1] - }, - { - "dflip":false, - "hflip":false, - "tileid":8, - "vflip":false, - "wangid":[0, 2, 0, 2, 0, 2, 0, 1] - }, - { - "dflip":false, - "hflip":false, - "tileid":9, - "vflip":false, - "wangid":[0, 1, 0, 2, 0, 2, 0, 2] - }, - { - "dflip":false, - "hflip":false, - "tileid":10, - "vflip":false, - "wangid":[0, 2, 0, 1, 0, 2, 0, 2] - }, - { - "dflip":false, - "hflip":false, - "tileid":11, - "vflip":false, - "wangid":[0, 2, 0, 2, 0, 1, 0, 2] - }, - { - "dflip":false, - "hflip":false, - "tileid":12, - "vflip":false, - "wangid":[0, 1, 0, 2, 0, 2, 0, 1] - }, - { - "dflip":false, - "hflip":false, - "tileid":13, - "vflip":false, - "wangid":[0, 1, 0, 1, 0, 2, 0, 2] - }, - { - "dflip":false, - "hflip":false, - "tileid":14, - "vflip":false, - "wangid":[0, 2, 0, 1, 0, 1, 0, 2] - }, - { - "dflip":false, - "hflip":false, - "tileid":15, - "vflip":false, - "wangid":[0, 2, 0, 2, 0, 1, 0, 1] - }, - { - "dflip":false, - "hflip":false, - "tileid":16, - "vflip":false, - "wangid":[0, 1, 0, 2, 0, 2, 0, 1] - }, - { - "dflip":false, - "hflip":false, - "tileid":17, - "vflip":false, - "wangid":[0, 1, 0, 1, 0, 2, 0, 2] - }, - { - "dflip":false, - "hflip":false, - "tileid":18, - "vflip":false, - "wangid":[0, 2, 0, 1, 0, 1, 0, 2] - }, - { - "dflip":false, - "hflip":false, - "tileid":19, - "vflip":false, - "wangid":[0, 2, 0, 2, 0, 1, 0, 1] - }, - { - "dflip":false, - "hflip":false, - "tileid":20, - "vflip":false, - "wangid":[0, 2, 0, 1, 0, 2, 0, 1] - }, - { - "dflip":false, - "hflip":false, - "tileid":21, - "vflip":false, - "wangid":[0, 1, 0, 2, 0, 1, 0, 2] - }, - { - "dflip":false, - "hflip":false, - "tileid":22, - "vflip":false, - "wangid":[0, 2, 0, 2, 0, 2, 0, 2] - }, - { - "dflip":false, - "hflip":false, - "tileid":23, - "vflip":false, - "wangid":[0, 2, 0, 2, 0, 2, 0, 2] - }] - }] - }], - "tilewidth":64, - "type":"map", - "version":1.2, - "width":25 -} \ No newline at end of file diff --git a/demo/resource/assets/isometric_grass_and_water.png b/demo/resource/assets/isometric_grass_and_water.png deleted file mode 100644 index b342a0cb..00000000 Binary files a/demo/resource/assets/isometric_grass_and_water.png and /dev/null differ diff --git a/demo/resource/default.res.json b/demo/resource/default.res.json index 45513fe1..44a2354c 100644 --- a/demo/resource/default.res.json +++ b/demo/resource/default.res.json @@ -1,7 +1,7 @@ { "groups": [ { - "keys": "checkbox_select_disabled_png,checkbox_select_down_png,checkbox_select_up_png,checkbox_unselect_png,selected_png,border_png,header_png,radiobutton_select_disabled_png,radiobutton_select_down_png,radiobutton_select_up_png,radiobutton_unselect_png,roundthumb_png,thumb_png,track_png,tracklight_png,handle_png,off_png,on_png,button_down_png,button_up_png,thumb_pb_png,track_pb_png,track_sb_png,bg_jpg,egret_icon_png,description_json,isometric_grass_and_water_json,isometric_grass_and_water_png", + "keys": "checkbox_select_disabled_png,checkbox_select_down_png,checkbox_select_up_png,checkbox_unselect_png,selected_png,border_png,header_png,radiobutton_select_disabled_png,radiobutton_select_down_png,radiobutton_select_up_png,radiobutton_unselect_png,roundthumb_png,thumb_png,track_png,tracklight_png,handle_png,off_png,on_png,button_down_png,button_up_png,thumb_pb_png,track_pb_png,track_sb_png,bg_jpg,egret_icon_png,description_json", "name": "preload" } ], @@ -132,19 +132,19 @@ "name": "egret_icon_png" }, { - "name": "description_json", + "url": "config/description.json", "type": "json", - "url": "config/description.json" + "name": "description_json" }, { - "name": "isometric_grass_and_water_json", + "url": "assets/isometric_grass_and_water.json", "type": "json", - "url": "assets/isometric_grass_and_water.json" + "name": "isometric_grass_and_water_json" }, { - "name": "isometric_grass_and_water_png", + "url": "assets/isometric_grass_and_water.png", "type": "image", - "url": "assets/isometric_grass_and_water.png" + "name": "isometric_grass_and_water_png" } ] } \ No newline at end of file