demo 更新

demo/resource/assets/isometric_grass_and_water.json

@@ -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
-}

demo/resource/assets/title.json

@@ -1,281 +0,0 @@
-{ "backgroundcolor":"#3b97d3",
- "height":26,
- "layers":[
-        {
-         "draworder":"topdown",
-         "height":26,
-         "name":"background",
-         "objects":[
-                {
-                 "gid":7,
-                 "height":262.666666666667,
-                 "id":11,
-                 "name":"",
-                 "rotation":0,
-                 "type":"",
-                 "visible":true,
-                 "width":1736,
-                 "x":-256,
-                 "y":920.666666666667
-                }, 
-                {
-                 "gid":6,
-                 "height":832,
-                 "id":34,
-                 "name":"",
-                 "rotation":0,
-                 "type":"",
-                 "visible":true,
-                 "width":1216,
-                 "x":122,
-                 "y":810
-                }],
-         "opacity":1,
-         "type":"objectgroup",
-         "visible":true,
-         "width":38,
-         "x":0,
-         "y":0
-        }, 
-        {
-         "draworder":"topdown",
-         "height":26,
-         "name":"clouds",
-         "objects":[
-                {
-                 "gid":8,
-                 "height":61.3333333333333,
-                 "id":14,
-                 "name":"",
-                 "rotation":0,
-                 "type":"",
-                 "visible":true,
-                 "width":184,
-                 "x":640,
-                 "y":320
-                }, 
-                {
-                 "gid":8,
-                 "height":61.3333333333333,
-                 "id":17,
-                 "name":"",
-                 "rotation":0,
-                 "type":"",
-                 "visible":true,
-                 "width":184,
-                 "x":336,
-                 "y":144
-                }, 
-                {
-                 "gid":8,
-                 "height":61.3333333333333,
-                 "id":21,
-                 "name":"",
-                 "rotation":0,
-                 "type":"",
-                 "visible":true,
-                 "width":192,
-                 "x":1024,
-                 "y":145
-                }, 
-                {
-                 "gid":2147483656,
-                 "height":61.3333333333333,
-                 "id":23,
-                 "name":"",
-                 "rotation":0,
-                 "type":"",
-                 "visible":true,
-                 "width":184,
-                 "x":44,
-                 "y":136
-                }, 
-                {
-                 "gid":6,
-                 "height":600,
-                 "id":8,
-                 "name":"",
-                 "rotation":0,
-                 "type":"",
-                 "visible":true,
-                 "width":954,
-                 "x":-226,
-                 "y":768
-                }, 
-                {
-                 "gid":2147483654,
-                 "height":546,
-                 "id":35,
-                 "name":"",
-                 "rotation":0,
-                 "type":"",
-                 "visible":true,
-                 "width":826,
-                 "x":710,
-                 "y":782
-                }, 
-                {
-                 "gid":2147483656,
-                 "height":103.333333333333,
-                 "id":36,
-                 "name":"",
-                 "rotation":0,
-                 "type":"",
-                 "visible":true,
-                 "width":284,
-                 "x":926,
-                 "y":307
-                }, 
-                {
-                 "gid":8,
-                 "height":103.333333333333,
-                 "id":37,
-                 "name":"",
-                 "rotation":0,
-                 "type":"",
-                 "visible":true,
-                 "width":284,
-                 "x":124,
-                 "y":353
-                }],
-         "opacity":0.490000009536743,
-         "type":"objectgroup",
-         "visible":true,
-         "width":38,
-         "x":0,
-         "y":0
-        }, 
-        {
-         "draworder":"topdown",
-         "height":38,
-         "name":"title",
-         "objects":[
-                {
-                 "gid":4,
-                 "height":386,
-                 "id":1,
-                 "name":"logo",
-                 "rotation":0,
-                 "type":"",
-                 "visible":true,
-                 "width":736,
-                 "x":256,
-                 "y":480
-                }],
-         "opacity":1,
-         "type":"objectgroup",
-         "visible":true,
-         "width":25,
-         "x":0,
-         "y":0
-        }, 
-        {
-         "draworder":"topdown",
-         "height":26,
-         "name":"help",
-         "objects":[
-                {
-                 "gid":3,
-                 "height":715.669407858419,
-                 "id":26,
-                 "name":"",
-                 "rotation":0,
-                 "type":"",
-                 "visible":true,
-                 "width":745.251573276788,
-                 "x":237.507948400548,
-                 "y":739.425850721188
-                }],
-         "opacity":1,
-         "type":"objectgroup",
-         "visible":false,
-         "width":38,
-         "x":0,
-         "y":0
-        }, 
-        {
-         "draworder":"topdown",
-         "height":38,
-         "name":"buttons",
-         "objects":[
-                {
-                 "gid":2,
-                 "height":85.3333333333333,
-                 "id":2,
-                 "name":"start",
-                 "rotation":0,
-                 "type":"",
-                 "visible":true,
-                 "width":256,
-                 "x":485,
-                 "y":655.333333333333
-                }, 
-                {
-                 "gid":1,
-                 "height":64,
-                 "id":3,
-                 "name":"help",
-                 "rotation":0,
-                 "type":"",
-                 "visible":true,
-                 "width":192,
-                 "x":515.599635905335,
-                 "y":761.206553703963
-                }],
-         "opacity":1,
-         "type":"objectgroup",
-         "visible":true,
-         "width":26,
-         "x":0,
-         "y":0
-        }],
- "nextobjectid":38,
- "orientation":"orthogonal",
- "renderorder":"right-down",
- "tileheight":32,
- "tilesets":[
-        {
-         "columns":0,
-         "firstgid":1,
-         "margin":0,
-         "name":"ui",
-         "spacing":0,
-         "tilecount":7,
-         "tileheight":832,
-         "tiles":
-            {
-             "0":
-                {
-                 "image":"buttonHelp.png"
-                },
-             "1":
-                {
-                 "image":"buttonStart.png"
-                },
-             "2":
-                {
-                 "image":"helpBackground.png"
-                },
-             "3":
-                {
-                 "image":"title.png"
-                },
-             "5":
-                {
-                 "image":"backgroundSet.png"
-                },
-             "6":
-                {
-                 "image":"block.png"
-                },
-             "7":
-                {
-                 "image":"cloud.png"
-                }
-            },
-         "tilewidth":1232
-        }],
- "tilewidth":32,
- "version":1,
- "width":38
-}

demo/resource/config/description.json

@@ -1,5 +0,0 @@
-[
-    "<font color=0x00ff0c>Open-source</font>,<font color=0x00ff0c>Free</font>,<font color=0x00ff0c>Multi-platform</font>",
-    "Push <font color=0x00ff0c>Game </font>Forward",
-    "<font color=0x00ff0c>HTML5 </font>Game Engine"
-]

demo/resource/default.res.json

@@ -1,165 +1,72 @@
 {
 	"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,orthogonal-outside_json,title_json",
+			"keys": "bg_png,bgNorm_png,moon_png,orange_png,moonNorm_png,orangeNorm_png,orthogonal-outside_json",
 			"name": "preload"
+		},
+		{
+			"keys": "loading",
+			"name": "loading"
+		},
+		{
+			"keys": "sc",
+			"name": "sc"
+		},
+		{
+			"keys": "common",
+			"name": "common"
 		}
 	],
 	"resources": [
 		{
-			"url": "assets/CheckBox/checkbox_select_disabled.png",
+			"url": "fgui/loading.fui",
+			"type": "bin",
+			"name": "loading"
+		},
+		{
+			"url": "preload/bg.png",
 			"type": "image",
-			"name": "checkbox_select_disabled_png"
+			"name": "bg_png"
 		},
 		{
-			"url": "assets/CheckBox/checkbox_select_down.png",
+			"url": "preload/bgNorm.png",
 			"type": "image",
-			"name": "checkbox_select_down_png"
+			"name": "bgNorm_png"
 		},
 		{
-			"url": "assets/CheckBox/checkbox_select_up.png",
+			"url": "preload/moon.png",
 			"type": "image",
-			"name": "checkbox_select_up_png"
+			"name": "moon_png"
 		},
 		{
-			"url": "assets/CheckBox/checkbox_unselect.png",
+			"url": "preload/orange.png",
 			"type": "image",
-			"name": "checkbox_unselect_png"
+			"name": "orange_png"
 		},
 		{
-			"url": "assets/ItemRenderer/selected.png",
+			"url": "preload/moonNorm.png",
 			"type": "image",
-			"name": "selected_png"
+			"name": "moonNorm_png"
 		},
 		{
-			"url": "assets/Panel/border.png",
+			"url": "preload/orangeNorm.png",
 			"type": "image",
-			"name": "border_png"
+			"name": "orangeNorm_png"
 		},
 		{
-			"url": "assets/Panel/header.png",
-			"type": "image",
-			"name": "header_png"
+			"url": "fgui/sc.fui",
+			"type": "bin",
+			"name": "sc"
 		},
 		{
-			"url": "assets/RadioButton/radiobutton_select_disabled.png",
-			"type": "image",
-			"name": "radiobutton_select_disabled_png"
+			"url": "fgui/common.fui",
+			"type": "bin",
+			"name": "common"
 		},
 		{
-			"url": "assets/RadioButton/radiobutton_select_down.png",
-			"type": "image",
-			"name": "radiobutton_select_down_png"
-		},
-		{
-			"url": "assets/RadioButton/radiobutton_select_up.png",
-			"type": "image",
-			"name": "radiobutton_select_up_png"
-		},
-		{
-			"url": "assets/RadioButton/radiobutton_unselect.png",
-			"type": "image",
-			"name": "radiobutton_unselect_png"
-		},
-		{
-			"url": "assets/ScrollBar/roundthumb.png",
-			"type": "image",
-			"name": "roundthumb_png"
-		},
-		{
-			"url": "assets/Slider/thumb.png",
-			"type": "image",
-			"name": "thumb_png"
-		},
-		{
-			"url": "assets/Slider/track.png",
-			"type": "image",
-			"name": "track_png"
-		},
-		{
-			"url": "assets/Slider/tracklight.png",
-			"type": "image",
-			"name": "tracklight_png"
-		},
-		{
-			"url": "assets/ToggleSwitch/handle.png",
-			"type": "image",
-			"name": "handle_png"
-		},
-		{
-			"url": "assets/ToggleSwitch/off.png",
-			"type": "image",
-			"name": "off_png"
-		},
-		{
-			"url": "assets/ToggleSwitch/on.png",
-			"type": "image",
-			"name": "on_png"
-		},
-		{
-			"url": "assets/Button/button_down.png",
-			"type": "image",
-			"name": "button_down_png"
-		},
-		{
-			"url": "assets/Button/button_up.png",
-			"type": "image",
-			"name": "button_up_png"
-		},
-		{
-			"url": "assets/ProgressBar/thumb_pb.png",
-			"type": "image",
-			"name": "thumb_pb_png"
-		},
-		{
-			"url": "assets/ProgressBar/track_pb.png",
-			"type": "image",
-			"name": "track_pb_png"
-		},
-		{
-			"url": "assets/ScrollBar/track_sb.png",
-			"type": "image",
-			"name": "track_sb_png"
-		},
-		{
-			"url": "assets/bg.jpg",
-			"type": "image",
-			"name": "bg_jpg"
-		},
-		{
-			"url": "assets/egret_icon.png",
-			"type": "image",
-			"name": "egret_icon_png"
-		},
-		{
-			"url": "config/description.json",
-			"type": "json",
-			"name": "description_json"
-		},
-		{
-			"url": "assets/isometric_grass_and_water.json",
-			"type": "json",
-			"name": "isometric_grass_and_water_json"
-		},
-		{
-			"url": "assets/isometric_grass_and_water.png",
-			"type": "image",
-			"name": "isometric_grass_and_water_png"
-		},
-		{
-			"url": "assets/000010000.img.json",
-			"type": "json",
-			"name": "000010000.img_json"
-		},
-		{
-			"url": "assets/orthogonal-outside.json",
+			"url": "preload/orthogonal-outside.json",
 			"type": "json",
 			"name": "orthogonal-outside_json"
-		},
-		{
-			"url": "assets/title.json",
-			"type": "json",
-			"name": "title_json"
 		}
 	]
 }

demo/resource/eui_skins/ButtonSkin.exml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<e:Skin class="skins.ButtonSkin" states="up,down,disabled" minHeight="50" minWidth="100" xmlns:e="http://ns.egret.com/eui">
-    <e:Image width="100%" height="100%" scale9Grid="1,3,8,8" alpha.disabled="0.5"
-             source="button_up_png"
-             source.down="button_down_png"/>
-    <e:Label id="labelDisplay" top="8" bottom="8" left="8" right="8"
-             size="20"
-             textColor="0xFFFFFF" verticalAlign="middle" textAlign="center"/>
-    <e:Image id="iconDisplay" horizontalCenter="0" verticalCenter="0"/>
-</e:Skin>

demo/resource/eui_skins/CheckBoxSkin.exml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<e:Skin class="skins.CheckBoxSkin" states="up,down,disabled,upAndSelected,downAndSelected,disabledAndSelected" xmlns:e="http://ns.egret.com/eui">
-    <e:Group width="100%" height="100%">
-        <e:layout>
-            <e:HorizontalLayout verticalAlign="middle"/>
-        </e:layout>
-        <e:Image fillMode="scale" alpha="1" alpha.disabled="0.5" alpha.down="0.7"
-                 source="checkbox_unselect_png"
-                 source.upAndSelected="checkbox_select_up_png"
-                 source.downAndSelected="checkbox_select_down_png"
-                 source.disabledAndSelected="checkbox_select_disabled_png"/>
-        <e:Label id="labelDisplay" size="20" textColor="0x707070"
-                 textAlign="center" verticalAlign="middle"
-                 fontFamily="Tahoma"/>
-    </e:Group>
-</e:Skin>

demo/resource/eui_skins/HScrollBarSkin.exml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<e:Skin class="skins.HScrollBarSkin" minWidth="20" minHeight="8" xmlns:e="http://ns.egret.com/eui">
-    <e:Image id="thumb" source="roundthumb_png" scale9Grid="3,3,2,2" height="8" width="30" verticalCenter="0"/>
-</e:Skin>

demo/resource/eui_skins/HSliderSkin.exml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<e:Skin class="skins.HSliderSkin" minWidth="20" minHeight="8" xmlns:e="http://ns.egret.com/eui">
-    <e:Image id="track" source="track_sb_png" scale9Grid="1,1,4,4" width="100%"
-             height="6" verticalCenter="0"/>
-    <e:Image id="thumb" source="thumb_png" verticalCenter="0"/>
-</e:Skin>

demo/resource/eui_skins/ItemRendererSkin.exml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<e:Skin class="skins.ItemRendererSkin" states="up,down,disabled" minHeight="50" minWidth="100" xmlns:e="http://ns.egret.com/eui">
-    <e:Image width="100%" height="100%" scale9Grid="1,3,8,8" alpha.disabled="0.5"
-             source="button_up_png"
-             source.down="button_down_png"/>
-    <e:Label id="labelDisplay" top="8" bottom="8" left="8" right="8"
-             size="20" fontFamily="Tahoma"
-             textColor="0xFFFFFF" text="{data}" verticalAlign="middle" textAlign="center"/>
-</e:Skin>

demo/resource/eui_skins/PanelSkin.exml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<e:Skin class="skins.PanelSkin" minHeight="230" minWidth="450" xmlns:e="http://ns.egret.com/eui">
-    <e:Image left="0" right="0" bottom="0"  top="0" source="border_png" scale9Grid="2,2,12,12" />
-    <e:Group id="moveArea" left="0" right="0" top="0" height="45">
-        <e:Image left="0" right="0" bottom="0"  top="0" source="header_png"/>
-        <e:Label id="titleDisplay" size="20" fontFamily="Tahoma" textColor="0xFFFFFF"
-                 wordWrap="false" left="15" right="5" verticalCenter="0"/>
-    </e:Group>
-    <e:Button id="closeButton" label="close" bottom="5" horizontalCenter="0"/>
-</e:Skin>

demo/resource/eui_skins/ProgressBarSkin.exml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<e:Skin class="skins.ProgressBarSkin" minWidth="30" minHeight="18" xmlns:e="http://ns.egret.com/eui">
-	<e:Image source="track_pb_png" scale9Grid="1,1,4,4" width="100%"
-			 height="100%" verticalCenter="0"/>
-	<e:Image id="thumb" height="100%" width="100%" source="thumb_pb_png"/>
-	<e:Label id="labelDisplay" textAlign="center" verticalAlign="middle"
-			 size="15" fontFamily="Tahoma" textColor="0x707070"
-			 horizontalCenter="0" verticalCenter="0"/>
-</e:Skin>

demo/resource/eui_skins/RadioButtonSkin.exml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<e:Skin class="skins.RadioButtonSkin" states="up,down,disabled,upAndSelected,downAndSelected,disabledAndSelected" xmlns:e="http://ns.egret.com/eui">
-    <e:Group width="100%" height="100%">
-        <e:layout>
-            <e:HorizontalLayout verticalAlign="middle"/>
-        </e:layout>
-        <e:Image fillMode="scale" alpha="1" alpha.disabled="0.5" alpha.down="0.7"
-                 source="radiobutton_unselect_png"
-                 source.upAndSelected="radiobutton_select_up_png"
-                 source.downAndSelected="radiobutton_select_down_png"
-                 source.disabledAndSelected="radiobutton_select_disabled_png"/>
-        <e:Label id="labelDisplay" size="20" textColor="0x707070"
-                 textAlign="center" verticalAlign="middle"
-                 fontFamily="Tahoma"/>
-    </e:Group>
-</e:Skin>

demo/resource/eui_skins/ScrollerSkin.exml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<e:Skin class="skins.ScrollerSkin" minWidth="20" minHeight="20" xmlns:e="http://ns.egret.com/eui">
-    <e:HScrollBar id="horizontalScrollBar" width="100%" bottom="0"/>
-    <e:VScrollBar id="verticalScrollBar" height="100%" right="0"/>
-</e:Skin>

demo/resource/eui_skins/TextInputSkin.exml

@@ -1,9 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<e:Skin class="skins.TextInputSkin" minHeight="40" minWidth="300" states="normal,disabled,normalWithPrompt,disabledWithPrompt" xmlns:e="http://ns.egret.com/eui">
-	<e:Image width="100%" height="100%" scale9Grid="1,3,8,8" source="button_up_png"/>
-	<e:Rect height="100%" width="100%" fillColor="0xffffff"/>
- 	<e:EditableText id="textDisplay" verticalCenter="0" left="10" right="10"
-	                textColor="0x000000" textColor.disabled="0xff0000" width="100%" height="24" size="20" />
-	<e:Label id="promptDisplay" verticalCenter="0" left="10" right="10"
-	                textColor="0xa9a9a9" width="100%" height="24" size="20" touchEnabled="false" includeIn="normalWithPrompt,disabledWithPrompt"/>
-</e:Skin>

demo/resource/eui_skins/ToggleSwitchSkin.exml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<e:Skin class="skins.ToggleSwitchSkin" states="up,down,disabled,upAndSelected,downAndSelected,disabledAndSelected" xmlns:e="http://ns.egret.com/eui">
-    <e:Image source="on_png"
-             source.up="off_png"
-             source.down="off_png"
-             source.disabled="off_png"/>
-    <e:Image source="handle_png"
-             horizontalCenter="-18"
-             horizontalCenter.upAndSelected="18"
-             horizontalCenter.downAndSelected="18"
-             horizontalCenter.disabledAndSelected="18"
-             verticalCenter="0"/>
-</e:Skin>

demo/resource/eui_skins/VScrollBarSkin.exml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<e:Skin class="skins.VScrollBarSkin" minWidth="8" minHeight="20" xmlns:e="http://ns.egret.com/eui">
-    <e:Image id="thumb" source="roundthumb_png" scale9Grid="3,3,2,2" height="30" width="8" horizontalCenter="0"/>
-</e:Skin>

demo/resource/eui_skins/VSliderSkin.exml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<e:Skin class="skins.VSliderSkin" minWidth="25" minHeight="30" xmlns:e="http://ns.egret.com/eui">
-    <e:Image id="track" source="track_png" scale9Grid="1,1,4,4" width="7" height="100%" horizontalCenter="0"/>
-    <e:Image id="thumb" source="thumb_png" horizontalCenter="0" />
-</e:Skin>