diff --git a/.gitignore b/.gitignore index 11c72867..f4f3cc6b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,6 @@ /.idea /.vscode /demo_wxgame +/demo/.wing +/demo/.idea +/demo/.vscode diff --git a/demo/.vscode/tasks.json b/demo/.vscode/tasks.json deleted file mode 100644 index 77b8de35..00000000 --- a/demo/.vscode/tasks.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "version": "0.1.0", - "command": "egret", - "isShellCommand": true, - "showOutput": "silent", - "args": [ - "build" - ], - "problemMatcher": "$tsc" -} \ No newline at end of file diff --git a/demo/.wing/launch.json b/demo/.wing/launch.json deleted file mode 100644 index 9a3f27f1..00000000 --- a/demo/.wing/launch.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "version": "0.2.0", - "configurations": [ - { - "name": "Launch Wing Player", - "type": "chrome", - "request": "launch", - "file": "index.html", - "runtimeExecutable": "${execPath}", - "useBuildInServer": true, - "sourceMaps": true, - "webRoot": "${workspaceRoot}", - "preLaunchTask":"build", - "port":5479 - }, - { - "name": "Launch Chrome", - "type": "chrome", - "request": "launch", - "file": "index.html", - "useBuildInServer": true, - "sourceMaps": true, - "webRoot": "${workspaceRoot}", - "preLaunchTask":"build", - "userDataDir":"${tmpdir}", - "port":5479 - } - ] -} \ No newline at end of file diff --git a/demo/.wing/settings.json b/demo/.wing/settings.json deleted file mode 100644 index 372e43ca..00000000 --- a/demo/.wing/settings.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "search.exclude": { - "**/bin-debug": true, - "**/bin-release": true - } -} \ No newline at end of file diff --git a/demo/.wing/tasks.json b/demo/.wing/tasks.json deleted file mode 100644 index 521f0c80..00000000 --- a/demo/.wing/tasks.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "version": "0.1.0", - "command": "egret", - "isShellCommand": true, - "suppressTaskName": true, - "tasks": [ - { - "taskName": "build", - "showOutput": "always", - "args": [ - "build", - "-sourcemap" - ], - "problemMatcher": "$tsc" - }, - { - "taskName": "clean", - "showOutput": "always", - "args": [ - "build", - "-e" - ], - "problemMatcher": "$tsc" - }, - { - "taskName": "publish", - "showOutput": "always", - "args": [ - "publish" - ], - "problemMatcher": "$tsc" - } - ] -} \ No newline at end of file diff --git a/demo/egretProperties.json b/demo/egretProperties.json index 1f7a10ee..2b676f9c 100644 --- a/demo/egretProperties.json +++ b/demo/egretProperties.json @@ -24,6 +24,9 @@ { "name": "promise" }, + { + "name": "dragonBones" + }, { "name": "framework", "path": "./libs/framework" @@ -31,6 +34,10 @@ { "name": "long", "path": "./libs/long" + }, + { + "name": "fairygui", + "path": "./libs/fairygui" } ] } \ No newline at end of file diff --git a/demo/index.html b/demo/index.html index 5ed3328a..3f4f4d67 100644 --- a/demo/index.html +++ b/demo/index.html @@ -31,7 +31,7 @@ data-content-width="640" data-content-height="1136" data-multi-fingered="2" - data-show-fps="true" data-show-log="false" + data-show-fps="false" data-show-log="false" data-show-fps-style="x:0,y:0,size:12,textColor:0xffffff,bgAlpha:0.9">