Commit c833d73d authored by rockyl's avatar rockyl

分流节点修改为负责最后一个出口

数据中心getDataByName增加容错
parent 8bd346c5
......@@ -4,8 +4,8 @@
declare const engine: any;
export default class ZoomButton {
static id = 'zoom-button';
export default class TouchZoom {
static id = 'touch-zoom';
host;
zoomTo = 1.1;
......@@ -18,11 +18,11 @@ export default class ZoomButton {
this.host.addEventListener(engine.MouseEvent.MOUSE_UP, this._onMouseUp, this);
}
_onMouseDown(e) {
private _onMouseDown(e) {
this.host.scaleX = this.host.scaleY = this.zoomTo;
}
_onMouseUp(e) {
private _onMouseUp(e) {
this.host.scaleX = this.host.scaleY = 1;
}
}
"use strict";
exports.__esModule = true;
var ZoomButton = (function () {
function ZoomButton() {
this.zoomTo = 1.1;
}
ZoomButton.prototype.mounted = function () {
this.host.anchorX = this.host.width / 2;
this.host.anchorY = this.host.height / 2;
this.host.addEventListener(engine.MouseEvent.MOUSE_DOWN, this._onMouseDown, this);
this.host.addEventListener(engine.MouseEvent.MOUSE_UP, this._onMouseUp, this);
};
ZoomButton.prototype._onMouseDown = function (e) {
this.host.scaleX = this.host.scaleY = this.zoomTo;
};
ZoomButton.prototype._onMouseUp = function (e) {
this.host.scaleX = this.host.scaleY = 1;
};
ZoomButton.id = 'zoom-button';
return ZoomButton;
}());
exports["default"] = ZoomButton;
......@@ -66,7 +66,7 @@ export class Process {
for (let i = 0, li = meta.output.length; i < li; i++) {
const key = meta.output[i];
p = this._executeNextProcess(key, args);
if (i === 0) {
if (i === li - 1) {
result = await p;
} else {
p.catch(e => {
......@@ -91,9 +91,9 @@ export class Process {
if (this._meta) {
let metaConfig = this._meta;
if (metaConfig) {
this.updateProps(payload);
if (metaConfig.script) {
let func = new Function('args', 'props', 'target', 'global', 'vm', warpAsyncScript(metaConfig.script));
this.updateProps(payload);
let globalContext = this._vm.globalContext;
result = await func(payload, this._config.props, this._target, globalContext, this._vm);
}
......@@ -204,7 +204,7 @@ export class Process {
}
}
if(props[key] === undefined && propsConfig[key].hasOwnProperty('default')){
if (props[key] === undefined && propsConfig[key].hasOwnProperty('default')) {
props[key] = propsConfig[key]['default'];
}
}
......
......@@ -26,7 +26,7 @@ export function applyScript(ctor: Function) {
* 脚本接口
*/
export interface IScript {
host: any;
host: any;
disabled: boolean;
mounted();
......@@ -68,13 +68,13 @@ export function registerScriptDef(id, def) {
});
}
export function registerScripts(scripts){
for(let id in scripts){
export function registerScripts(scripts) {
for (let id in scripts) {
let code = scripts[id];
let create = new Function('exports', code);
let exports = {};
let exports: any = {};
create(exports);
registerScriptDef(id, exports['default']);
registerScriptDef(id, exports.default);
}
}
......
......@@ -59,7 +59,9 @@ export class DataCenter extends EventDispatcher {
*/
getDataByName(name, throwException?) {
let watcher = this.getWatcher(name);
return getDataByPath(this.store, watcher.path, throwException);
if(watcher){
return getDataByPath(this.store, watcher.path, throwException);
}
}
/**
......
......@@ -4,6 +4,7 @@
export * from './launcher'
export * from './decorators/scripts'
export * from './decorators/events'
import {instantiate} from './game-warpper/view-interpreter'
export {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment