Merge branch 'auto_align_qx' into dev

# Conflicts:
#	src/2d/display/Sprite.ts
#	src/2d/text/TextField.ts
#	src/zeroing/launcher.ts

.idea/codeStyles/codeStyleConfig.xml

+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
+  </state>
+</component>
\ No newline at end of file

.idea/inspectionProfiles/Project_Default.xml

+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="TsLint" enabled="true" level="WARNING" enabled_by_default="true" />
+  </profile>
+</component>
\ No newline at end of file

.idea/misc.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
+    <option name="languageLevel" value="FLOW" />
   </component>
 </project>
\ No newline at end of file

.idea/shelf/Uncommitted_changes_before_Checkout_at_2020_5_15__2_12___Default_Changelist_.xml

+<changelist name="Uncommitted_changes_before_Checkout_at_2020_5_15,_2_12_下午_[Default_Changelist]" date="1589523138013" recycled="false" toDelete="true">
+  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Checkout_at_2020_5_15,_2_12_下午_[Default_Changelist]/shelved.patch" />
+  <option name="DESCRIPTION" value="Uncommitted changes before Checkout at 2020/5/15, 2:12 下午 [Default Changelist]" />
+</changelist>
\ No newline at end of file

.idea/shelf/Uncommitted_changes_before_Update_at_2020_5_14__2_47___Default_Changelist_.xml

+<changelist name="Uncommitted_changes_before_Update_at_2020_5_14,_2_47_下午_[Default_Changelist]" date="1589438835098" recycled="false" toDelete="true">
+  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2020_5_14,_2_47_下午_[Default_Changelist]/shelved.patch" />
+  <option name="DESCRIPTION" value="Uncommitted changes before Update at 2020/5/14, 2:47 下午 [Default Changelist]" />
+</changelist>
\ No newline at end of file

package.json

@@ -7,14 +7,14 @@
   "dependencies": {
     "color": "^3.1.2",
     "emoji-regex": "^8.0.0",
-    "howler": "^2.1.2"
+    "howler": "^2.1.2",
+    "rollup-plugin-progress": "^1.1.2"
   },
   "devDependencies": {
     "dts-bundle": "^0.7.3",
     "glob": "^7.1.6",
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-node-resolve": "^5.2.0",
-    "rollup-plugin-progress": "^1.1.1",
     "rollup-plugin-typescript": "^1.0.1",
     "rollup-plugin-typescript2": "^0.25.2",
     "rollup-plugin-uglify": "^6.0.3",

rollup.config.js

@@ -26,10 +26,10 @@ export default {
 		},
 	],
 	plugins: [
-		progress(),
+		// progress(),
 		resolve({}),
 		typescript({
-			//useTsconfigDeclarationDir: true,
+			// useTsconfigDeclarationDir: true,
 		}),
 		commonjs(),
 		process.env.BUILD === 'production' && uglify({})

src/2d/display/Stage.ts

@@ -12,6 +12,7 @@ import {WebglRenderer} from "../renderers/WebglRenderer";
 import {GDispatcher} from "../events/GDispatcher";
 import CanvasRenderer from "../renderers/CanvasRenderer";
 import {GlobalPro, isWebGLSupported} from "../utils/index";
+// import { alignMgr } from "../../zeroing/decorators/AlignManager";
 
 //如果以后还出现帧率问题，使用ticker；
 //兼容requestAnimationFrame
@@ -971,15 +972,17 @@ export class Stage extends Container {
 		//记录起始时间
 		if (!GlobalPro.startTime) GlobalPro.startTime = Date.now();
 
-		//console.log('flushAll', Date.now());
-
-		if (!Stage._pause) {
-			let len = Stage.allUpdateObjList.length;
-			for (let i = 0; i < len; i++) {
-				Stage.allUpdateObjList[i] && Stage.allUpdateObjList[i].flush();
-			}
+        //console.log('flushAll', Date.now());
+        if (!Stage._pause) {
+            let len = Stage.allUpdateObjList.length;
+            for (let i = 0; i < len; i++) {
+                Stage.allUpdateObjList[i] && Stage.allUpdateObjList[i].flush();
+            }
 		}
-		requestAnimationFrame(Stage.flushAll);
+
+        // alignMgr.flush();
+
+        requestAnimationFrame(Stage.flushAll);
 	}
 
 	/**
@@ -1035,4 +1038,4 @@ export class Stage extends Container {
 		s._ml = null;
 		super.destroy();
 	}
-}
+}
\ No newline at end of file

src/2d/events/Event.ts

@@ -9,9 +9,10 @@ import {HashObject} from "../HashObject";
  */
 export class Event extends HashObject {
 
-	// public static IMAGE_LOADED: string = "onImageLoaded"
+    public static MAYBE_ALIGN: string = "maybeAlign";
 
-	/**
+	// public static IMAGE_LOADED: string = "onImageLoaded"
+    /**
 	 * 舞台尺寸发生变化时触发
 	 * @Event
 	 * @property RESIZE

src/zeroing/launcher.ts

@@ -11,8 +11,10 @@ import {Event} from "../2d/events/Event";
 import builtinLoadingView from "./game-warpper/LoadingView";
 import {queryParams} from "./web";
 import {initAutoLayout} from "./game-warpper/auto-layout";
+import { alignMgr } from "./decorators/AlignManager";
 
 export let gameStage: GameStage;
+export let alignManager = alignMgr;
 
 export function launch(url, loadingDelegate?, onStart?) {
 	if (queryParams.__proxy_mode__) {

yarn.lock

@@ -438,10 +438,10 @@ rollup-plugin-node-resolve@^5.2.0:
     resolve "^1.11.1"
     rollup-pluginutils "^2.8.1"
 
-rollup-plugin-progress@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.npm.taobao.org/rollup-plugin-progress/download/rollup-plugin-progress-1.1.1.tgz#fcce2f915d545014ac89ea0927ee97cb48052f60"
-  integrity sha1-/M4vkV1UUBSsieoJJ+6Xy0gFL2A=
+rollup-plugin-progress@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.npm.taobao.org/rollup-plugin-progress/download/rollup-plugin-progress-1.1.2.tgz#5c1dfe7c50f654906bc34d167d5512ee1a4b72d5"
+  integrity sha1-XB3+fFD2VJBrw00WfVUS7hpLctU=
   dependencies:
     chalk "^2.4.2"