update

honingwon · honingwon · commit 33ad8c1edd98 · 2017-08-21T20:42:48.000+08:00
diff --git a/bin/index.html b/bin/index.html
@@ -18,6 +18,7 @@
 </head>
 
 <body>
+	<script src="./require.js"></script>
 	<!--核心包，封装了显示对象渲染，事件，时间管理，时间轴动画，缓动，消息交互,socket，本地存储，鼠标触摸，声音，加载，颜色滤镜，位图字体等-->
 	<script type="text/javascript" src="libs/laya.core.js"></script>
 	<!--封装了webgl渲染管线，如果使用webgl渲染，可以在初始化时调用Laya.init(1000,800,laya.webgl.WebGL);-->
@@ -37,7 +38,10 @@
 	<!-- 物理引擎matter.js -->
 	<!--用户自定义顺序文件添加到这里-->
 	<!--jsfile--Custom-->
-	<script data-main="js/GameMain" src="./require.js" defer async="true"></script>
+	<script src="./js/GameMain.js"></script>
+	<script>
+		require(['./GameMain'],function(){});
+	</script>
 	<!--jsfile--Custom-->
 	<!--自定义的js(src文件夹下)文件自动添加到下面jsfile模块标签里面里-->
 	<!--删除标签，ide不会自动添加js文件，请谨慎操作-->
diff --git a/bin/js/Foo.js b/bin/js/Foo.js
@@ -0,0 +1,15 @@
+define(["require", "exports", "./Laya"], function (require, exports, Laya_1) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var Foo = (function () {
+        function Foo() {
+            var hello = new Laya_1.Text();
+            hello.text = 'Hello LayaAir';
+            hello.fontSize = 20;
+            hello.color = '#ffffff';
+            Laya.stage.addChild(hello);
+        }
+        return Foo;
+    }());
+    exports.Foo = Foo;
+});
diff --git a/bin/js/GameMain.js b/bin/js/GameMain.js
@@ -1,14 +1,9 @@
-define("adapter", ["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.Text = Laya.Text;
-});
-define("Foo", ["require", "exports", "adapter"], function (require, exports, adapter_1) {
+define("Foo", ["require", "exports", "./Laya"], function (require, exports, Laya_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     var Foo = (function () {
         function Foo() {
-            var hello = new adapter_1.Text();
+            var hello = new Laya_1.Text();
             hello.text = 'Hello LayaAir';
             hello.fontSize = 20;
             hello.color = '#ffffff';
diff --git a/bin/libs/laya.core.js b/bin/libs/laya.core.js
@@ -19575,3 +19575,13 @@ var Laya=window.Laya=(function(window,document){
 	new LayaMain();
 
 })(window,document,Laya);
+
+if (typeof define === "function" && define.amd)
+{
+	define('Laya', ["require", "exports"], function (require, exports) {
+		"use strict";
+		Object.defineProperty(exports, "__esModule", { value: true });
+		exports.Text = Laya.Text;
+	});
+}	
+
diff --git a/src/Foo.ts b/src/Foo.ts
@@ -1,4 +1,4 @@
-import { Text } from './adapter';
+import { Text } from './Laya';
 export class Foo {
     constructor() {
         const hello = new Text();
diff --git a/src/adapter.ts b/src/adapter.ts
diff --git a/tsconfig.json b/tsconfig.json
@@ -5,8 +5,8 @@
         "module": "amd",
         "skipLibCheck": true,
         "outDir": "./bin/js",
-        "outFile": "./bin/js/GameMain.js",
-        "watch": true
+        "outFile": "./bin/js/GameMain.js"//,
+        // "watch": true
     },
     "experimentalDecorators": true,
     "exclude": [

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { Text } from './adapter';`
	`1`	`+import { Text } from './Laya';`
`2`	`2`	`export class Foo {`
`3`	`3`	`constructor() {`
`4`	`4`	`const hello = new Text();`