Merge remote-tracking branch 'origin/designtime' into designtime

debug/engine.js

@@ -15589,6 +15589,12 @@ var tslib = {__extends: __extends,__assign: __assign,__rest: __rest,__decorate:
 	    };
 	    TextField.prototype._calculateBounds = function () {
 	        var _a = this._localBoundsSelf, width = _a.width, height = _a.height;
+<<<<<<< HEAD
+	        var matrix = this.transform.worldMatrix;
+	        this._bounds.x = matrix.tx;
+	        this._bounds.y = matrix.ty;
+=======
+>>>>>>> 94674e57a616ffee254265568109dfb6e9d69533
 	        this._bounds.width = width;
 	        this._bounds.height = height;
 	    };
@@ -19615,6 +19621,12 @@ var tslib = {__extends: __extends,__assign: __assign,__rest: __rest,__decorate:
 	            if (url.indexOf('://') >= 0) {
 	                if (url.indexOf(assetScheme) === 0) {
 	                    url = url.replace(assetScheme, '');
+<<<<<<< HEAD
+	                    if (exports.editorMode) {
+	                        url = exports.assetResolver(url);
+	                    }
+=======
+>>>>>>> 94674e57a616ffee254265568109dfb6e9d69533
 	                }
 	            }
 	            else {

src/2d/loader/Loader.ts

@@ -117,11 +117,9 @@ export class Loader extends EventDispatcher {
 			//console.log("覆盖原先数据：" + name);
 		}
 		this.caches[name] = data;
-		console.log(this.caches)
 	}
 
 	get(name: string) {
-		console.log(this.caches)
 		return this.caches[name];
 	}
 }

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

@@ -48,7 +48,6 @@ export class Image extends Sprite implements IUIComponent {
 						}*/
 
 						if (editorMode) {
-							console.log("assetResolver(url)",assetResolver(url))
 							url = assetResolver(url);
 						}
 					}