demo 更新

This commit is contained in:
yhh
2020-08-21 19:21:40 +08:00
parent 6d4d787530
commit 646d1806ec
144 changed files with 51196 additions and 2531 deletions
+3
View File
@@ -4,3 +4,6 @@
/.idea
/.vscode
/demo_wxgame
/demo/.wing
/demo/.idea
/demo/.vscode
-10
View File
@@ -1,10 +0,0 @@
{
"version": "0.1.0",
"command": "egret",
"isShellCommand": true,
"showOutput": "silent",
"args": [
"build"
],
"problemMatcher": "$tsc"
}
-29
View File
@@ -1,29 +0,0 @@
{
"version": "0.2.0",
"configurations": [
{
"name": "Launch Wing Player",
"type": "chrome",
"request": "launch",
"file": "index.html",
"runtimeExecutable": "${execPath}",
"useBuildInServer": true,
"sourceMaps": true,
"webRoot": "${workspaceRoot}",
"preLaunchTask":"build",
"port":5479
},
{
"name": "Launch Chrome",
"type": "chrome",
"request": "launch",
"file": "index.html",
"useBuildInServer": true,
"sourceMaps": true,
"webRoot": "${workspaceRoot}",
"preLaunchTask":"build",
"userDataDir":"${tmpdir}",
"port":5479
}
]
}
-6
View File
@@ -1,6 +0,0 @@
{
"search.exclude": {
"**/bin-debug": true,
"**/bin-release": true
}
}
-34
View File
@@ -1,34 +0,0 @@
{
"version": "0.1.0",
"command": "egret",
"isShellCommand": true,
"suppressTaskName": true,
"tasks": [
{
"taskName": "build",
"showOutput": "always",
"args": [
"build",
"-sourcemap"
],
"problemMatcher": "$tsc"
},
{
"taskName": "clean",
"showOutput": "always",
"args": [
"build",
"-e"
],
"problemMatcher": "$tsc"
},
{
"taskName": "publish",
"showOutput": "always",
"args": [
"publish"
],
"problemMatcher": "$tsc"
}
]
}
+7
View File
@@ -24,6 +24,9 @@
{
"name": "promise"
},
{
"name": "dragonBones"
},
{
"name": "framework",
"path": "./libs/framework"
@@ -31,6 +34,10 @@
{
"name": "long",
"path": "./libs/long"
},
{
"name": "fairygui",
"path": "./libs/fairygui"
}
]
}
+2 -2
View File
@@ -31,7 +31,7 @@
data-content-width="640"
data-content-height="1136"
data-multi-fingered="2"
data-show-fps="true" data-show-log="false"
data-show-fps="false" data-show-log="false"
data-show-fps-style="x:0,y:0,size:12,textColor:0xffffff,bgAlpha:0.9">
</div>
<script>
@@ -77,7 +77,7 @@
* "calculateCanvasScaleFactor": //a function return canvas scale factor
* }
**/
egret.runEgret({ renderMode: "canvas", audioType: 0, calculateCanvasScaleFactor:function(context) {
egret.runEgret({ renderMode: "webgl", audioType: 0, calculateCanvasScaleFactor:function(context) {
var backingStore = context.backingStorePixelRatio ||
context.webkitBackingStorePixelRatio ||
context.mozBackingStorePixelRatio ||
+2444
View File
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because one or more lines are too long
+19
View File
@@ -328,6 +328,7 @@ declare module es {
onAddedToScene(): void;
onRemovedFromScene(): void;
update(): void;
debugRender(): void;
addComponent<T extends Component>(component: T): T;
getComponent<T extends Component>(type: any): T;
hasComponent<T extends Component>(type: any): boolean;
@@ -923,6 +924,7 @@ declare module es {
onEntityTransformChanged(comp: transform.Component): void;
onEntityEnabled(): void;
onEntityDisabled(): void;
debugRender(): void;
}
}
declare module es {
@@ -1008,6 +1010,7 @@ declare module es {
isVisible: boolean;
isVisibleFromCamera(camera: Camera): any;
render(camera: Camera): any;
debugRender(): any;
}
class RenderableComparer {
compare(self: IRenderable, other: IRenderable): number;
@@ -1152,6 +1155,9 @@ declare module es {
abstract class Renderer {
camera: Camera;
readonly renderOrder: number;
renderTexture: egret.RenderTexture;
shouldDebugRender: boolean;
readonly wantsToRenderToSceneRenderTarget: boolean;
protected constructor(renderOrder: number, camera?: Camera);
onAddedToScene(scene: Scene): void;
unload(): void;
@@ -1160,6 +1166,7 @@ declare module es {
compareTo(other: Renderer): number;
protected beginRender(cam: Camera): void;
protected renderAfterStateCheck(renderable: IRenderable, cam: Camera): void;
protected debugRender(scene: Scene, cam: Camera): void;
}
}
declare module es {
@@ -1168,9 +1175,21 @@ declare module es {
render(scene: Scene): void;
}
}
declare module es {
class RenderLayerExcludeRenderer extends Renderer {
excludedRenderLayers: number[];
constructor(renderOrder: number, ...excludedRenderLayers: number[]);
render(scene: es.Scene): void;
protected debugRender(scene: es.Scene, cam: es.Camera): void;
}
}
declare module es {
class ScreenSpaceRenderer extends Renderer {
renderLayers: number[];
constructor(renderOrder: number, ...renderLayers: number[]);
render(scene: Scene): void;
protected debugRender(scene: es.Scene, cam: es.Camera): void;
onSceneBackBufferSizeChanged(newWidth: number, newHeight: number): void;
}
}
declare module es {
+124 -26
View File
@@ -1536,6 +1536,9 @@ var es;
Entity.prototype.update = function () {
this.components.update();
};
Entity.prototype.debugRender = function () {
this.components.debugRender();
};
Entity.prototype.addComponent = function (component) {
component.entity = this;
this.components.add(component);
@@ -2712,6 +2715,8 @@ var es;
this._areBoundsDirty = true;
};
RenderableComponent.prototype.isVisibleFromCamera = function (camera) {
if (!camera)
return false;
this.isVisible = camera.bounds.intersects(this.displayObject.getBounds().union(this.bounds));
return this.isVisible;
};
@@ -4230,6 +4235,12 @@ var es;
for (var i = 0; i < this._components.length; i++)
this._components[i].onDisabled();
};
ComponentList.prototype.debugRender = function () {
for (var i = 0; i < this._components.length; i++) {
if (this._components[i].enabled)
this._components[i].debugRender();
}
};
ComponentList.compareUpdatableOrder = new es.IUpdatableComparer();
return ComponentList;
}());
@@ -5444,9 +5455,17 @@ var es;
function Renderer(renderOrder, camera) {
if (camera === void 0) { camera = null; }
this.renderOrder = 0;
this.shouldDebugRender = true;
this.camera = camera;
this.renderOrder = renderOrder;
}
Object.defineProperty(Renderer.prototype, "wantsToRenderToSceneRenderTarget", {
get: function () {
return !!this.renderTexture;
},
enumerable: true,
configurable: true
});
Renderer.prototype.onAddedToScene = function (scene) {
};
Renderer.prototype.unload = function () {
@@ -5461,6 +5480,13 @@ var es;
Renderer.prototype.renderAfterStateCheck = function (renderable, cam) {
renderable.render(cam);
};
Renderer.prototype.debugRender = function (scene, cam) {
for (var i = 0; i < scene.entities.count; i++) {
var entity = scene.entities.buffer[i];
if (entity.enabled)
entity.debugRender();
}
};
return Renderer;
}());
es.Renderer = Renderer;
@@ -5486,13 +5512,85 @@ var es;
es.DefaultRenderer = DefaultRenderer;
})(es || (es = {}));
var es;
(function (es) {
var RenderLayerExcludeRenderer = (function (_super) {
__extends(RenderLayerExcludeRenderer, _super);
function RenderLayerExcludeRenderer(renderOrder) {
var excludedRenderLayers = [];
for (var _i = 1; _i < arguments.length; _i++) {
excludedRenderLayers[_i - 1] = arguments[_i];
}
var _this = _super.call(this, renderOrder, null) || this;
_this.excludedRenderLayers = excludedRenderLayers;
return _this;
}
RenderLayerExcludeRenderer.prototype.render = function (scene) {
var cam = this.camera ? this.camera : scene.camera;
this.beginRender(cam);
for (var i = 0; i < scene.renderableComponents.count; i++) {
var renderable = scene.renderableComponents.buffer[i];
if (!this.excludedRenderLayers.contains(renderable.renderLayer) && renderable.enabled &&
renderable.isVisibleFromCamera(cam))
this.renderAfterStateCheck(renderable, cam);
}
if (this.shouldDebugRender && es.Core.debugRenderEndabled)
this.debugRender(scene, cam);
};
RenderLayerExcludeRenderer.prototype.debugRender = function (scene, cam) {
for (var i = 0; i < scene.renderableComponents.count; i++) {
var renderable = scene.renderableComponents.buffer[i];
if (!this.excludedRenderLayers.contains(renderable.renderLayer) && renderable.enabled &&
renderable.isVisibleFromCamera(cam))
renderable.debugRender();
}
_super.prototype.debugRender.call(this, scene, cam);
};
return RenderLayerExcludeRenderer;
}(es.Renderer));
es.RenderLayerExcludeRenderer = RenderLayerExcludeRenderer;
})(es || (es = {}));
var es;
(function (es) {
var ScreenSpaceRenderer = (function (_super) {
__extends(ScreenSpaceRenderer, _super);
function ScreenSpaceRenderer() {
return _super !== null && _super.apply(this, arguments) || this;
function ScreenSpaceRenderer(renderOrder) {
var renderLayers = [];
for (var _i = 1; _i < arguments.length; _i++) {
renderLayers[_i - 1] = arguments[_i];
}
var _this = _super.call(this, renderOrder, null) || this;
renderLayers.sort();
renderLayers.reverse();
_this.renderLayers = renderLayers;
return _this;
}
ScreenSpaceRenderer.prototype.render = function (scene) {
this.beginRender(this.camera);
for (var i = 0; i < this.renderLayers.length; i++) {
var renderables = scene.renderableComponents.componentsWithRenderLayer(this.renderLayers[i]);
for (var j = 0; j < renderables.length; j++) {
var renderable = renderables[j];
if (renderable.enabled && renderable.isVisibleFromCamera(this.camera))
this.renderAfterStateCheck(renderable, this.camera);
}
}
if (this.shouldDebugRender && es.Core.debugRenderEndabled)
this.debugRender(scene, this.camera);
};
ScreenSpaceRenderer.prototype.debugRender = function (scene, cam) {
for (var i = 0; i < this.renderLayers.length; i++) {
var renderables = scene.renderableComponents.componentsWithRenderLayer(this.renderLayers[i]);
for (var j = 0; j < renderables.length; j++) {
var entity = renderables[j];
if (entity.enabled)
entity.debugRender();
}
}
};
ScreenSpaceRenderer.prototype.onSceneBackBufferSizeChanged = function (newWidth, newHeight) {
_super.prototype.onSceneBackBufferSizeChanged.call(this, newWidth, newHeight);
if (!this.camera)
this.camera = es.Core.scene.createEntity("screenspace camera").addComponent(new es.Camera());
};
return ScreenSpaceRenderer;
}(es.Renderer));
@@ -8102,22 +8200,21 @@ var es;
};
TiledMapLoader.parseTmxTileset = function (map, xTileset) {
return __awaiter(this, void 0, void 0, function () {
var xFirstGid, firstGid, source, xDocTileset, tileset;
var xFirstGid, firstGid, source, xDocTileset;
return __generator(this, function (_a) {
switch (_a.label) {
case 0:
xFirstGid = xTileset["firstgid"];
firstGid = xFirstGid;
source = xTileset["image"];
source = xTileset["source"];
if (!(source != undefined)) return [3, 2];
source = map.tmxDirectory + source;
return [4, RES.getResByUrl(source, null, this, RES.ResourceItem.TYPE_IMAGE).catch(function (err) {
return [4, RES.getResByUrl(source).catch(function (err) {
throw new Error(err);
})];
case 1:
xDocTileset = _a.sent();
tileset = this.loadTmxTileset(new es.TmxTileset(), map, xDocTileset["tileset"], firstGid);
return [2, tileset];
return [2, this.loadTmxTileset(new es.TmxTileset(), map, xDocTileset["tileset"], firstGid)];
case 2: return [2, this.loadTmxTileset(new es.TmxTileset(), map, xTileset, firstGid)];
}
});
@@ -8125,9 +8222,9 @@ var es;
};
TiledMapLoader.loadTmxTileset = function (tileset, map, xTileset, firstGid) {
return __awaiter(this, void 0, void 0, function () {
var xImage, _a, _i, _b, e, _c, _d, _e, t, xTile, tile, id, y, column, x;
return __generator(this, function (_f) {
switch (_f.label) {
var xImage, _i, _a, e, _b, _c, _d, t, xTile, tile, id, y, column, x;
return __generator(this, function (_e) {
switch (_e.label) {
case 0:
tileset.map = map;
tileset.firstGid = firstGid;
@@ -8141,38 +8238,39 @@ var es;
tileset.tileOffset = this.parseTmxTileOffset(xTileset["tileoffset"]);
xImage = xTileset["image"];
if (!xImage) return [3, 2];
_a = tileset;
return [4, this.loadTmxImage(new es.TmxImage(), xTileset, map.tmxDirectory).catch(function (err) {
return [4, this.loadTmxImage(new es.TmxImage(), xTileset, map.tmxDirectory).then(function (image) {
tileset.image = image;
}).catch(function (err) {
throw new Error(err);
})];
case 1:
_a.image = _f.sent();
_f.label = 2;
_e.sent();
_e.label = 2;
case 2:
tileset.terrains = [];
if (xTileset["terrains"])
for (_i = 0, _b = xTileset["terrains"]; _i < _b.length; _i++) {
e = _b[_i];
for (_i = 0, _a = xTileset["terrains"]; _i < _a.length; _i++) {
e = _a[_i];
tileset.terrains.push(this.parseTmxTerrain(e));
}
tileset.tiles = new Map();
_c = [];
for (_d in xTileset["tiles"])
_c.push(_d);
_e = 0;
_f.label = 3;
_b = [];
for (_c in xTileset["tiles"])
_b.push(_c);
_d = 0;
_e.label = 3;
case 3:
if (!(_e < _c.length)) return [3, 6];
t = _c[_e];
if (!(_d < _b.length)) return [3, 6];
t = _b[_d];
if (!xTileset["tiles"].hasOwnProperty(t)) return [3, 5];
xTile = xTileset["tiles"][t];
return [4, this.loadTmxTilesetTile(new es.TmxTilesetTile(), tileset, xTile, tileset.terrains, map.tmxDirectory)];
case 4:
tile = _f.sent();
tile = _e.sent();
tileset.tiles.set(tile.id == undefined ? Number(t) + 1 : tile.id, tile);
_f.label = 5;
_e.label = 5;
case 5:
_e++;
_d++;
return [3, 3];
case 6:
tileset.properties = this.parsePropertyDict(xTileset["properties"]);
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because one or more lines are too long
+28 -9
View File
@@ -7,19 +7,38 @@
"libs/modules/game/game.js",
"libs/modules/tween/tween.js",
"libs/modules/promise/promise.js",
"libs/modules/dragonBones/dragonBones.js",
"libs/framework/framework.js",
"libs/long/long.js"
"libs/long/long.js",
"libs/fairygui/fairygui.js"
],
"game": [
"bin-debug/AssetAdapter.js",
"bin-debug/LoadingUI.js",
"bin-debug/Main.js",
"bin-debug/Fgui/common/commonBinder.js",
"bin-debug/UI/mvc/BaseView.js",
"bin-debug/SampleHelpers/SampleScene.js",
"bin-debug/UI/loading/LoadingView.js",
"bin-debug/Scenes/Empty Scene/BasicScene.js",
"bin-debug/Fgui/common/UI_com_tips.js",
"bin-debug/Fgui/loading/loadingBinder.js",
"bin-debug/Fgui/loading/UI_View_loading.js",
"bin-debug/Fgui/sc/scBinder.js",
"bin-debug/Fgui/sc/UI_btn_sc.js",
"bin-debug/Fgui/sc/UI_View_sc.js",
"bin-debug/Platform.js",
"bin-debug/Scenes/Animated Tiles/AnimatedTilesScene.js",
"bin-debug/Main.js",
"bin-debug/UI/PopManager.js",
"bin-debug/UI/loading/LoadingControl.js",
"bin-debug/UI/loading/LoadingEvents.js",
"bin-debug/ThemeAdapter.js",
"bin-debug/game/MainScene.js",
"bin-debug/game/PlayerController.js",
"bin-debug/game/SimplePooled.js",
"bin-debug/game/SpawnerComponent.js",
"bin-debug/game/SpawnerSystem.js"
"bin-debug/AssetAdapter.js",
"bin-debug/UI/mvc/EventManager.js",
"bin-debug/UI/mvc/Extension.js",
"bin-debug/UI/mvc/FguiUtils.js",
"bin-debug/UI/mvc/LayerManager.js",
"bin-debug/UI/mvc/ViewManager.js",
"bin-debug/UI/sc/ScControl.js",
"bin-debug/UI/sc/ScEvents.js",
"bin-debug/UI/sc/ScView.js"
]
}
Binary file not shown.

Before

Width:  |  Height:  |  Size: 456 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 438 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 439 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 535 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 538 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 337 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 314 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 340 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 314 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 361 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 349 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 813 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 813 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 569 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 458 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 313 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 933 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 502 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 303 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 313 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 444 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 535 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 536 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 136 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 137 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 47 KiB

@@ -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
}
Binary file not shown.

Before

Width:  |  Height:  |  Size: 102 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

-281
View File
@@ -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
}
Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

-5
View File
@@ -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"
]
+37 -130
View File
@@ -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"
}
]
}
-10
View File
@@ -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>
-16
View File
@@ -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>
@@ -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>
-6
View File
@@ -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>
@@ -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>
-10
View File
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
-5
View File
@@ -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>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

After

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 61 KiB

+19
View File
@@ -0,0 +1,19 @@
/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
module FUI.common {
export class UI_com_tips extends fairygui.GComponent {
public m_content:fairygui.GTextField;
public static URL:string = "ui://minsdstak7mf0";
public static createInstance():UI_com_tips {
return <UI_com_tips>(fairygui.UIPackage.createObject("common", "com_tips"));
}
protected constructFromXML(xml:any):void {
super.constructFromXML(xml);
this.m_content = <fairygui.GTextField>(this.getChildAt(1));
}
}
}
+10
View File
@@ -0,0 +1,10 @@
/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
module FUI.common {
export class commonBinder {
public static bindAll():void {
fairygui.UIObjectFactory.setPackageItemExtension(UI_com_tips.URL, UI_com_tips);
}
}
}
+21
View File
@@ -0,0 +1,21 @@
/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
module FUI.loading {
export class UI_View_loading extends fairygui.GComponent {
public m_title:fairygui.GTextField;
public m_pg_loading:fairygui.GProgressBar;
public static URL:string = "ui://mk2d64e7r5ro0";
public static createInstance():UI_View_loading {
return <UI_View_loading>(fairygui.UIPackage.createObject("loading", "View_loading"));
}
protected constructFromXML(xml:any):void {
super.constructFromXML(xml);
this.m_title = <fairygui.GTextField>(this.getChildAt(1));
this.m_pg_loading = <fairygui.GProgressBar>(this.getChildAt(2));
}
}
}
+10
View File
@@ -0,0 +1,10 @@
/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
module FUI.loading {
export class loadingBinder {
public static bindAll():void {
fairygui.UIObjectFactory.setPackageItemExtension(UI_View_loading.URL, UI_View_loading);
}
}
}
+19
View File
@@ -0,0 +1,19 @@
/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
module FUI.sc {
export class UI_View_sc extends fairygui.GComponent {
public m_list_sc:fairygui.GList;
public static URL:string = "ui://m4sln17ak7mf0";
public static createInstance():UI_View_sc {
return <UI_View_sc>(fairygui.UIPackage.createObject("sc", "View_sc"));
}
protected constructFromXML(xml:any):void {
super.constructFromXML(xml);
this.m_list_sc = <fairygui.GList>(this.getChildAt(0));
}
}
}
+19
View File
@@ -0,0 +1,19 @@
/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
module FUI.sc {
export class UI_btn_sc extends fairygui.GButton {
public m_name:fairygui.GTextField;
public static URL:string = "ui://m4sln17ak7mf2";
public static createInstance():UI_btn_sc {
return <UI_btn_sc>(fairygui.UIPackage.createObject("sc", "btn_sc"));
}
protected constructFromXML(xml:any):void {
super.constructFromXML(xml);
this.m_name = <fairygui.GTextField>(this.getChildAt(3));
}
}
}
+11
View File
@@ -0,0 +1,11 @@
/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
module FUI.sc {
export class scBinder {
public static bindAll():void {
fairygui.UIObjectFactory.setPackageItemExtension(UI_View_sc.URL, UI_View_sc);
fairygui.UIObjectFactory.setPackageItemExtension(UI_btn_sc.URL, UI_btn_sc);
}
}
}
-51
View File
@@ -1,51 +0,0 @@
//////////////////////////////////////////////////////////////////////////////////////
//
// Copyright (c) 2014-present, Egret Technology.
// All rights reserved.
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright
// notice, this list of conditions and the following disclaimer in the
// documentation and/or other materials provided with the distribution.
// * Neither the name of the Egret nor the
// names of its contributors may be used to endorse or promote products
// derived from this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY EGRET AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
// OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
// IN NO EVENT SHALL EGRET AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;LOSS OF USE, DATA,
// OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
// EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//
//////////////////////////////////////////////////////////////////////////////////////
class LoadingUI extends egret.Sprite implements RES.PromiseTaskReporter {
public constructor() {
super();
this.createView();
}
private textField: egret.TextField;
private createView(): void {
this.textField = new egret.TextField();
this.addChild(this.textField);
this.textField.y = 300;
this.textField.width = 480;
this.textField.height = 100;
this.textField.textAlign = "center";
}
public onProgress(current: number, total: number): void {
this.textField.text = `Loading...${current}/${total}`;
}
}
+21 -15
View File
@@ -27,36 +27,42 @@
//
//////////////////////////////////////////////////////////////////////////////////////
import LoadingView = loading.LoadingView;
class Main extends es.Core {
protected initialize() {
this.runGame();
try {
this.runGame();
} catch(err) {
console.error(err);
}
}
private runGame() {
egret.ImageLoader.crossOrigin = "anonymous";
this.initUIConfig();
this.loadResource();
this.initGameControl();
}
private initUIConfig(){
LayerManager.getInstance().init(this.stage);
FguiUtils.packageNamespace = FUI;
fairygui.UIConfig.defaultFont = "黑体";
fairygui.UIConfig.bringWindowToFrontOnClick = false;
this.stage.addChild(fgui.GRoot.inst.displayListContainer);
}
private loadResource() {
const loadingView = new LoadingUI();
this.stage.addChild(loadingView);
RES.loadConfig("resource/default.res.json", "resource/").then(()=>{
RES.loadGroup("preload", 0, loadingView).then(()=>{
this.stage.removeChild(loadingView);
this.createGameScene();
}).catch(err => {
console.error(err);
});
EventManager.getInstance().dispatch(loading.LoadingEvents.OPENVIEW);
}).catch(err =>{
console.error(err);
});
}
/**
*
* Create scene interface
*/
protected createGameScene(): void {
es.Core.scene = new scene.MainScene();
private initGameControl(){
loading.LoadingControl.getInstance();
sc.ScControl.getInstance();
}
}
+35
View File
@@ -0,0 +1,35 @@
module samples {
import ScreenSpaceRenderer = es.ScreenSpaceRenderer;
import RenderLayerExcludeRenderer = es.RenderLayerExcludeRenderer;
import SpriteRenderer = es.SpriteRenderer;
export class SampleScene extends es.Scene {
public static readonly screenSpaceRenderLayer = 999;
public canvas: SpriteRenderer;
public static _needsFullRender: boolean;
public _screenSpaceRenderer: ScreenSpaceRenderer;
constructor(addExcludeRenderer: boolean = true, needsFullRender: boolean = false){
super();
SampleScene._needsFullRender = needsFullRender;
if (needsFullRender){
this._screenSpaceRenderer = this.addRenderer(new ScreenSpaceRenderer(100, SampleScene.screenSpaceRenderLayer));
this._screenSpaceRenderer.shouldDebugRender = false;
}else{
this.addRenderer(new ScreenSpaceRenderer(100, SampleScene.screenSpaceRenderLayer));
}
if (addExcludeRenderer)
this.addRenderer(new RenderLayerExcludeRenderer(0, SampleScene.screenSpaceRenderLayer));
this.canvas = this.createEntity("ui").addComponent(new SpriteRenderer());
this.canvas.renderLayer = SampleScene.screenSpaceRenderLayer;
this.setupSceneSelector();
}
public setupSceneSelector(){
}
}
}
@@ -0,0 +1,21 @@
module samples {
export class AnimatedTilesScene extends SampleScene {
constructor(){
super(true, true);
}
public initialize(){
super.initialize();
let tiledEntity = this.createEntity("tiled-map-entity");
try {
es.TiledMapLoader.loadTmxMap(new es.TmxMap(), "orthogonal-outside_json").then(map => {
tiledEntity.addComponent(new es.TiledMapRenderer(map));
manager.AlterManager.alter_tips("Tiled tiles场景加载成功");
});
} catch (err){
console.error(err);
}
}
}
}
@@ -0,0 +1,8 @@
module samples {
export class BasicScene extends SampleScene {
public async onStart() {
super.onStart();
manager.AlterManager.alter_tips("空白场景加载成功");
}
}
}
+25
View File
@@ -0,0 +1,25 @@
module manager {
export class AlterManager {
public static alter_tips(txt: string){
let item_tip = FUI.common.UI_com_tips.createInstance();
if (!item_tip)
return;
item_tip.m_content.text = txt;
item_tip.ensureBoundsCorrect();
item_tip.x = es.Core.Instance.stage.stageWidth / 2 - item_tip.width / 2;
item_tip.y = es.Core.Instance.stage.stageHeight / 2 - item_tip.height / 2;
LayerManager.getInstance().tipsLayer.addChild(item_tip.displayObject);
item_tip.alpha = 0;
let originY = item_tip.y;
egret.Tween.get(item_tip).to({alpha: 1, y: originY - 100}, 700, egret.Ease.cubicInOut).wait(1000)
.to({alpha: 0, y: originY - 200}, 700, egret.Ease.cubicInOut).call(()=>{
egret.Tween.removeTweens(item_tip.displayObject);
if (item_tip.displayObject && item_tip.displayObject.parent)
item_tip.displayObject.parent.removeChild(item_tip.displayObject);
item_tip.dispose();
item_tip = null;
});
}
}
}
+27
View File
@@ -0,0 +1,27 @@
module loading {
export class LoadingControl {
private _eventManager: EventManager;
private _viewManager: ViewManager;
private static single: LoadingControl;
public static getInstance(){
if (!this.single) this.single = new LoadingControl();
return this.single;
}
constructor(){
this.addEvents();
}
private addEvents(){
this._eventManager = EventManager.getInstance();
this._viewManager = ViewManager.getInstance();
// 事件监听
this._eventManager.addListener(LoadingEvents.OPENVIEW, this.openView, this);
}
private openView(){
this._viewManager.openView(LoadingView);
}
}
}
+5
View File
@@ -0,0 +1,5 @@
module loading {
export module LoadingEvents {
export const OPENVIEW = Symbol();
}
}
+59
View File
@@ -0,0 +1,59 @@
module loading {
import commonBinder = FUI.common.commonBinder;
import ResourceInfo = RES.ResourceInfo;
export class LoadingView extends BaseView implements RES.PromiseTaskReporter {
private _ui: FUI.loading.UI_View_loading;
private _loadGroup = ["preload", "common"];
private _maxProgress = 0;
private _currentProgress = 0;
constructor() {
super("loading");
}
public init() {
this._ui = this._fuiView = FUI.loading.UI_View_loading.createInstance();
this.addChild(this._ui.displayObject);
super.init();
}
public async show() {
this._ui.m_pg_loading.value = 0;
for (let i = 0; i < this._loadGroup.length; i ++){
this._maxProgress += RES.getGroupByName(this._loadGroup[i]).length;
}
this._ui.m_pg_loading.max = this._maxProgress;
for (let i = 0; i < this._loadGroup.length; i ++){
await RES.loadGroup(this._loadGroup[i], 0, this);
}
}
public onProgress(current: number, total: number, resItem: ResourceInfo): void {
this._ui.m_pg_loading.tweenValue(this._currentProgress++, 1);
if (this._currentProgress == this._maxProgress) {
if (resItem.name == "common"){
fairygui.UIPackage.addPackage(resItem.name);
commonBinder.bindAll();
}
egret.setTimeout(() => {
this.openMainScene();
}, this, 1000)
}
}
public openMainScene() {
es.Core.scene = new samples.BasicScene();
EventManager.getInstance().dispatch(sc.ScEvents.OPENVIEW);
this.close();
}
public destroy() {
if (this._ui) {
this._ui.dispose();
this._ui = null;
}
super.destroy();
}
}
}
+101
View File
@@ -0,0 +1,101 @@
class BaseView extends egret.DisplayObjectContainer {
private _name: string;
public get name(){
return this._name;
}
public set name(value: string){
this._name = value;
}
public viewLayer: viewLayer = viewLayer.pop;
/** 是否可以被销毁 */
protected _destoryChildren: boolean;
protected _isDispose: boolean;
/** fui界面 */
protected _fuiView: fairygui.GComponent;
/** 是否已经显示 */
protected _isShow: boolean;
/** 视图数据 */
protected _showData: any;
constructor(name?: string){
super();
this._isDispose = false;
if (name){
this.name = name;
}
}
/**
*
*/
public init(){
this._destoryChildren = true;
}
/**
*
*/
public resize(){
if (this._fuiView && this._isShow){
this._fuiView.width = LayerManager.getInstance().stage.stageWidth;
this._fuiView.height = LayerManager.getInstance().stage.stageHeight;
}
}
/**
*
* @param showData
*/
public baseShow(showData?: any){
this._isShow = true;
this._showData = showData;
egret.callLater(this.resize, this);
}
/**
*
*/
public show() {
}
/**
*
*/
public close() {
this._isShow = false;
ViewManager.getInstance().closeView(this);
}
/**
*
* @param showData
*/
public baseRefresh(showData?: any){
this._showData = showData;
}
/**
*
*/
public refresh(showData?: any){
this._showData = showData;
}
/**
*
*/
public destroy(){
this._isDispose = true;
if (this.parent)
this.parent.removeChild(this);
if (this._destoryChildren){
this._fuiView = null;
while (this.numChildren > 0){
this.removeChildAt(0);
}
this._destoryChildren = false;
}
}
}
+104
View File
@@ -0,0 +1,104 @@
class EventManager {
private static _single: EventManager;
private _dict: any;
private _eventList: EventVo[];
public static getInstance() {
if (!this._single) this._single = new EventManager();
return this._single;
}
constructor() {
this._dict = {};
this._eventList = [];
}
/**
*
* @param type
* @param listener
* @param thisObj
*/
public addListener(type: string | symbol, listener: Function, thisObj: any): void {
var arr: any[] = this._dict[type];
if (arr == null) {
arr = [];
this._dict[type] = arr;
}
var i: number, len: number = arr.length;
for (i = 0; i < len; i++) {
if (arr[i][0] == listener && arr[i][1] == thisObj) return;
}
arr.push([listener, thisObj]);
}
/**
*
* @param type
* @param listener
* @param thisObj
*/
public removeListener(type: string | symbol, listener: Function, thisObj: any): void {
var arr: any[] = this._dict[type];
if (arr == null) return;
var i: number, len: number = Array.length;
for (i = 0; i < len; i++) {
if (arr[i][0] == listener && arr[i][1] == thisObj) {
arr.splice(i, 1);
i--;
break;
}
}
if (arr.length == 0) {
delete this._dict[type];
this._dict[type] = null;
}
}
/**
*
* @param type
* @param param
*/
public dispatch(type: string | symbol, ...param: any[]): void {
if (this._dict[type] == null) return;
var vo: EventVo = new EventVo();
vo.type = type;
vo.param = param;
this.dealMsg(vo);
}
/**
*
* @param vo
*/
private dealMsg(vo: EventVo): void {
var listeners: Array<any> = this._dict[vo.type];
if (listeners && listeners.length > 0) {
var i: number = 0, len: number = listeners.length, listener: Array<any> = null;
while (i < len) {
listener = listeners[i];
listener[0].apply(listener[1], vo.param);
if (listeners.length != len) {
len = listeners.length;
i--;
}
i++;
}
}
vo.dispose();
}
}
class EventVo {
public type: string | symbol;
public param: any[];
public dispose() {
this.type = null;
this.param = null;
}
}
+389
View File
@@ -0,0 +1,389 @@
declare interface String {
/**
*
* @param c
*/
trimStart(c);
/**
*
* @param c
*/
trimEnd(c);
}
String.prototype.trimStart = function (c) {
function trimStart(str, c) {
let regExp;
if (!c) {
regExp = new RegExp(/^\s*/);
} else {
regExp = new RegExp("^" + c);
}
return str.replace(regExp, "");
}
return trimStart(this, c);
};
String.prototype.trimEnd = function (c) {
function trimEnd(str, c) {
let regExp;
if (!c) {
regExp = new RegExp(/\s*$/);
} else {
regExp = new RegExp(c + "$");
}
return str.replace(regExp, "");
}
return trimEnd(this, c);
};
declare interface Array<T> {
/**
*
* @param predicate
*/
findIndex(predicate: Function): number;
/**
*
* @param predicate
*/
any(predicate: Function): boolean;
/**
*
* @param predicate
*/
firstOrDefault(predicate: Function): T;
/**
*
* @param predicate
*/
find(predicate: Function): T;
/**
*
* @param predicate
*/
where(predicate: Function): Array<T>;
/**
*
* @param predicate
*/
count(predicate: Function): number;
/**
*
* @param predicate
*/
findAll(predicate: Function): Array<T>;
/**
*
* @param predicate
*/
removeAll(predicate: Function): void;
/**
*
* @param element
*/
remove(element): boolean;
/**
*
* @param index
*/
removeAt(index): void;
/**
*
* @param index
* @param count
*/
removeRange(index, count): void;
/**
*
* @param selector
*/
select(selector: Function): Array<T>;
/**
*
* @param keySelector key选择器
* @param comparer
*/
orderBy(keySelector: Function, comparer: Function): Array<T>;
/**
*
* @param keySelector key选择器
* @param comparer
*/
orderByDescending(keySelector: Function, comparer: Function): Array<T>;
/**
*
* @param keySelector key选择器
*/
groupBy(keySelector: Function): Array<T>;
/**
*
* @param selector
*/
sum(selector);
}
Array.prototype.findIndex = function (predicate) {
function findIndex(array, predicate) {
for (let i = 0, len = array.length; i < len; i++) {
if (predicate.call(arguments[2], array[i], i, array)) {
return i;
}
}
return -1;
}
return findIndex(this, predicate);
};
Array.prototype.any = function (predicate) {
function any(array, predicate) {
return array.findIndex(predicate) > -1;
}
return any(this, predicate);
};
Array.prototype.firstOrDefault = function (predicate) {
function firstOrDefault(array, predicate) {
let index = array.findIndex(predicate);
return index == -1 ? null : array[index];
}
return firstOrDefault(this, predicate);
};
Array.prototype.find = function (predicate) {
function find(array, predicate) {
return array.firstOrDefault(predicate);
}
return find(this, predicate);
};
Array.prototype.where = function (predicate) {
function where(array, predicate) {
if (typeof array.reduce === "function") {
return array.reduce(function (ret, element, index) {
if (predicate.call(arguments[2], element, index, array)) {
ret.push(element);
}
return ret;
}, []);
} else {
let ret = [];
for (let i = 0, len = array.length; i < len; i++) {
let element = array[i];
if (predicate.call(arguments[2], element, i, array)) {
ret.push(element);
}
}
return ret;
}
}
return where(this, predicate);
};
Array.prototype.count = function (predicate) {
function count(array, predicate) {
return array.where(predicate).length;
}
return count(this, predicate);
};
Array.prototype.findAll = function (predicate) {
function findAll(array, predicate) {
return array.where(predicate);
}
return findAll(this, predicate);
};
Array.prototype.removeAll = function (predicate) {
function removeAll(array, predicate) {
let index;
do {
index = array.findIndex(predicate);
if (index >= 0) {
array.splice(index, 1);
}
} while (index >= 0);
}
removeAll(this, predicate);
};
Array.prototype.remove = function (element) {
function remove(array, element) {
let index = array.findIndex(function (x) {
return x === element;
});
if (index >= 0) {
array.splice(index, 1);
return true;
} else {
return false;
}
}
return remove(this, element);
};
Array.prototype.removeAt = function (index) {
function removeAt(array, index) {
array.splice(index, 1);
}
return removeAt(this, index);
};
Array.prototype.removeRange = function (index, count) {
function removeRange(array, index, count) {
array.splice(index, count);
}
return removeRange(this, index, count);
};
Array.prototype.select = function (selector) {
function select(array, selector) {
if (typeof array.reduce === "function") {
return array.reduce(function (ret, element, index) {
ret.push(selector.call(arguments[2], element, index, array));
return ret;
}, []);
} else {
let ret = [];
for (let i = 0, len = array.length; i < len; i++) {
ret.push(selector.call(arguments[2], array[i], i, array));
}
return ret;
}
}
return select(this, selector);
};
Array.prototype.orderBy = function (keySelector, comparer) {
function orderBy(array, keySelector, comparer) {
array.sort(function (x, y) {
let v1 = keySelector(x);
let v2 = keySelector(y);
if (comparer) {
return comparer(v1, v2);
} else {
return v1 > v2 ? 1 : -1;
}
});
return array;
}
return orderBy(this, keySelector, comparer);
};
Array.prototype.orderByDescending = function (keySelector, comparer) {
function orderByDescending(array, keySelector, comparer) {
array.sort(function (x, y) {
let v1 = keySelector(x);
let v2 = keySelector(y);
if (comparer) {
return -comparer(v1, v2);
} else {
return v1 < v2 ? 1 : -1;
}
});
return array;
}
return orderByDescending(this, keySelector, comparer);
};
Array.prototype.groupBy = function (keySelector) {
function groupBy(array, keySelector) {
if (typeof array.reduce === "function") {
let keys = [];
return array.reduce(function (groups, element, index) {
let key = JSON.stringify(
keySelector.call(arguments[1], element, index, array)
);
let index2 = keys.findIndex(function (x) {
return x === key;
});
if (index2 < 0) {
index2 = keys.push(key) - 1;
}
if (!groups[index2]) {
groups[index2] = [];
}
groups[index2].push(element);
return groups;
}, []);
} else {
let groups = [];
let keys = [];
for (let i = 0, len = array.length; i < len; i++) {
let key = JSON.stringify(
keySelector.call(arguments[1], array[i], i, array)
);
let index = keys.findIndex(function (x) {
return x === key;
});
if (index < 0) {
index = keys.push(key) - 1;
}
if (!groups[index]) {
groups[index] = [];
}
groups[index].push(array[i]);
}
return groups;
}
}
return groupBy(this, keySelector);
};
Array.prototype.sum = function (selector) {
function sum(array, selector) {
let ret;
for (let i = 0, len = array.length; i < len; i++) {
if (i == 0) {
if (selector) {
ret = selector.call(arguments[2], array[i], i, array);
} else {
ret = array[i];
}
} else {
if (selector) {
ret += selector.call(arguments[2], array[i], i, array);
} else {
ret += array[i];
}
}
}
return ret;
}
return sum(this, selector);
};
+25
View File
@@ -0,0 +1,25 @@
class FguiUtils {
/** 包的命名空间 */
public static packageNamespace: any;
/** 加载fgui资源 */
public static load(name: string): Promise<any> {
return new Promise((resolve, reject) => {
let existPkg = fairygui.UIPackage.getByName(name);
if (existPkg) {
resolve();
}
RES.loadGroup(name, 0).then(()=>{
fairygui.UIPackage.addPackage(name);
if (this.packageNamespace[name][name + "Binder"])
this.packageNamespace[name][name + "Binder"].bindAll();
resolve();
}).catch(err => {
console.error("loadfgui error:" + err);
reject();
});
});
}
}

Some files were not shown because too many files have changed in this diff Show More