更新tiny-image库

px-token.js

@@ -33,7 +33,7 @@ function getPxToken(callback) {
 		};
 		xhr.send();
 	} else {
-		callback('need login');
+		callback('need reload');
 	}
 
 	function failedCallback() {

px-token.min.js

-function getPxToken(n){if(window.ohjaiohdf){var o=new XMLHttpRequest;o.open("get","getToken",!0),o.onreadystatechange=function(){if(4===o.readyState&&200===o.status){var e=JSON.parse(o.response);if(e.success)window.eval(e.data),n(null,window.ohjaiohdf());else switch(e.code){case"100001":n("need login");break;case"100024":n("state invalid");break;default:n(e.code)}}},o.onerror=function(e){t()},o.onloadend=function(){404===o.status&&t()},o.send()}else n("need login");function t(){n("net error")}}
+function getPxToken(n){if(window.ohjaiohdf){var o=new XMLHttpRequest;o.open("get","getToken",!0),o.onreadystatechange=function(){if(4===o.readyState&&200===o.status){var e=JSON.parse(o.response);if(e.success)window.eval(e.data),n(null,window.ohjaiohdf());else switch(e.code){case"100001":n("need login");break;case"100024":n("state invalid");break;default:n(e.code)}}},o.onerror=function(e){t()},o.onloadend=function(){404===o.status&&t()},o.send()}else n("need reload");function t(){n("net error")}}
\ No newline at end of file

src/2d/display/Container.ts

-import { DisplayObject } from './DisplayObject';
-import { Rectangle } from "../math/Rectangle";
-import { Point } from '../math/index';
+import {DisplayObject} from './DisplayObject';
+import {Rectangle} from "../math/Rectangle";
+import {Point} from '../math/index';
 import CanvasRenderer from '../renderers/CanvasRenderer';
-import { Event } from "../events/Event"
-import { WebglRenderer } from '../renderers/WebglRenderer';
-
-import { applyAutoAdjust } from "../../zeroing/decorators/auto-adjust";
-import { applyScript } from "../../zeroing/decorators/scripts";
-import { applyEvents } from "../../zeroing/decorators/events";
-import { afterConstructor } from "../../zeroing/decorators/after-constructor";
-import { injectProperties, instantiateScript, toBoolean } from "../../zeroing/utils/index";
-import { isUI } from "../../zeroing/game-warpper/nodes/IUIComponent";
+import {Event} from "../events/Event"
+import {WebglRenderer} from '../renderers/WebglRenderer';
+
+import {applyAutoAdjust} from "../../zeroing/decorators/auto-adjust";
+import {applyScript} from "../../zeroing/decorators/scripts";
+import {applyEvents} from "../../zeroing/decorators/events";
+import {afterConstructor} from "../../zeroing/decorators/after-constructor";
+import {injectProperties, instantiateScript, toBoolean} from "../../zeroing/utils/index";
+import {isUI} from "../../zeroing/game-warpper/nodes/IUIComponent";
 import Transform from "../math/Transform";
 
 /**
@@ -784,7 +784,7 @@ export default class Container extends DisplayObject {
 	}
 
 	set x(value: number) {
-        if(this.destroyed){
+		if (this.destroyed) {
 			return;
 		}
 		if (value == this.transform.position.x) return;
@@ -798,7 +798,7 @@ export default class Container extends DisplayObject {
 	}
 
 	set y(value: number) {
-        if(this.destroyed){
+		if (this.destroyed) {
 			return;
 		}
 		if (value == this.transform.position.y) return;

src/2d/display/FloatDisplay.ts

@@ -40,6 +40,11 @@ export class FloatDisplay extends DisplayObject {
 	 */
 	private _transformID: number;
 
+	/**
+	 * 记录是否需要修改位置矩阵
+	 */
+	private _shouldUpdateStyle: boolean;
+
 	/**
 	 * 构造函数
 	 * @method FloatDisplay
@@ -89,13 +94,9 @@ export class FloatDisplay extends DisplayObject {
 		this._transformID = -1;
 	}
 
-	addHtmlElement() {
+	addHtmlElement(el?) {
 		let s = this;
 
-		if(!s.stage){
-			return;
-		}
-
 		if (!container) {
 			container = document.createElement('div');
 			container.style.position = "absolute";
@@ -105,25 +106,36 @@ export class FloatDisplay extends DisplayObject {
 			container.style.lineHeight = 'normal';
 			s.stage.rootDiv.appendChild(container);//, s.stage.rootDiv.childNodes[0]
 		}
+
 		if (s._htmlElement) {
-			let style = s._htmlElement.style;
+			try {
+				container.removeChild(s._htmlElement);
+			}catch (e){
+
+			}
+		}
+		if(el){
+			s._htmlElement = el;
+		}
+		container.appendChild(s._htmlElement);
+
 		if (!s._isAdded) {
 			s._isAdded = true;
-				container.appendChild(s._htmlElement);
 			s.stage["_floatDisplayList"].push(s);
 		} else {
 			if (s._htmlElement && s.visible) {
+				let style = s._htmlElement.style;
 				style.display = "block";
 			}
 		}
 	}
-	}
 
 	get htmlElement() {
 		return this._htmlElement;
 	}
 
 	set htmlElement(v) {
+		this._shouldUpdateStyle = true;
 		this.init(v);
 		this.updateStyle();
 	}
@@ -169,9 +181,13 @@ export class FloatDisplay extends DisplayObject {
 		// s._bounds.height = h;
 		s._localBoundsSelf.width = w;
 		s._localBoundsSelf.height = h;
+
+		if (!s.stage) {
 			s._htmlElement = she;
+			return;
+		}
 
-		this.addHtmlElement();
+		this.addHtmlElement(she);
 	}
 
 	/**
@@ -227,7 +243,8 @@ export class FloatDisplay extends DisplayObject {
 				style.display = show;
 			}
 			if (visible) {
-				if (this._transformID != this.transform._worldID) {
+				if (this._shouldUpdateStyle || this._transformID != this.transform._worldID) {
+					this._shouldUpdateStyle = false;
 					this._transformID = this.transform._worldID
 					let mtx = s.transform.worldMatrix;
 					let d = devicePixelRatio;

src/zeroing/decorators/AlignManager.ts

@@ -19,7 +19,6 @@ class AlignManager {
 	 * flash (渲染前)
 	 */
 	public flush() {
-
 		const list = this.alignList;
 
 		list.forEach((v: Container) => {

src/zeroing/game-warpper/GameStage.ts

@@ -134,11 +134,11 @@ export class GameStage extends Node {
 
 		await this.loadPreloadAssets(onPreloadAssetsProgress, onPreloadAssetsComplete);
 
-		this.start();
-
 		dealPxEnv();
 		dealPageRemainTime();
 
+		this.start();
+
 		onStart && onStart();
 
 		setTimeout(this.lazyLoadAllAssets,

src/zeroing/game-warpper/nodes/TextInput.ts

@@ -224,8 +224,6 @@ export class TextInput extends Label implements IUIComponent {
 
 		this.fillColor = this._oldFillColor;
 		this.strokeColor = this._oldStrokeColor;
-
-		this.dispatchEvent(Event.BLUR);
 	}
 
 	private onFocus = (e) => {
@@ -235,6 +233,8 @@ export class TextInput extends Label implements IUIComponent {
 	private onBlur = (e) => {
 		this.setBlur();
 
+		this.dispatchEvent(Event.BLUR);
+
 		delayScrollTop();
 	};
 

src/zeroing/log-switch.ts

@@ -4,20 +4,21 @@
 
 const storeKey = 'zlog-switch';
 
-export enum Logs{
+export enum Logs {
 	PROCESS = 'process',
 }
 
 let store;
 
 try {
-	store = JSON.parse(localStorage.getItem(storeKey));
+	let t = localStorage.getItem(storeKey);
+	store = t ? JSON.parse(t) : null;
 	store = store === null ? false : store;
 } catch (e) {
 	store = false;
 	localStorage.setItem(storeKey, JSON.stringify(store));
 }
 
-export function getLogSwitch(id):boolean | Array {
+export function getLogSwitch(id): boolean | Array {
 	return typeof store === 'object' ? store[id] : !!store;
 }

zeroing-engine.iml

@@ -2,9 +2,8 @@
 <module type="WEB_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/dist" />
-    </content>
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
\ No newline at end of file