From 646d1806ecae35e5307093c1fb8cfd1ea7ae9ca1 Mon Sep 17 00:00:00 2001 From: yhh <359807859@qq.com> Date: Fri, 21 Aug 2020 19:21:40 +0800 Subject: [PATCH] =?UTF-8?q?demo=20=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 + demo/.vscode/tasks.json | 10 - demo/.wing/launch.json | 29 - demo/.wing/settings.json | 6 - demo/.wing/tasks.json | 34 - demo/egretProperties.json | 7 + demo/index.html | 4 +- demo/libs/fairygui/fairygui.d.ts | 2444 ++ demo/libs/fairygui/fairygui.js | 19026 ++++++++++++++++ demo/libs/fairygui/fairygui.min.js | 1 + demo/libs/framework/framework.d.ts | 19 + demo/libs/framework/framework.js | 150 +- demo/libs/framework/framework.min.js | 2 +- .../libs/modules/dragonBones/dragonBones.d.ts | 8471 +++++++ demo/libs/modules/dragonBones/dragonBones.js | 18213 +++++++++++++++ .../modules/dragonBones/dragonBones.min.js | 1 + demo/manifest.json | 37 +- demo/resource/assets/Button/button_down.png | Bin 456 -> 0 bytes demo/resource/assets/Button/button_up.png | Bin 438 -> 0 bytes .../CheckBox/checkbox_select_disabled.png | Bin 439 -> 0 bytes .../assets/CheckBox/checkbox_select_down.png | Bin 535 -> 0 bytes .../assets/CheckBox/checkbox_select_up.png | Bin 538 -> 0 bytes .../assets/CheckBox/checkbox_unselect.png | Bin 337 -> 0 bytes .../resource/assets/ItemRenderer/selected.png | Bin 314 -> 0 bytes demo/resource/assets/Panel/border.png | Bin 340 -> 0 bytes demo/resource/assets/Panel/header.png | Bin 314 -> 0 bytes demo/resource/assets/ProgressBar/thumb_pb.png | Bin 361 -> 0 bytes demo/resource/assets/ProgressBar/track_pb.png | Bin 349 -> 0 bytes .../radiobutton_select_disabled.png | Bin 813 -> 0 bytes .../RadioButton/radiobutton_select_down.png | Bin 813 -> 0 bytes .../RadioButton/radiobutton_select_up.png | Bin 569 -> 0 bytes .../RadioButton/radiobutton_unselect.png | Bin 458 -> 0 bytes demo/resource/assets/ScrollBar/roundthumb.png | Bin 313 -> 0 bytes demo/resource/assets/ScrollBar/track_sb.png | Bin 933 -> 0 bytes demo/resource/assets/Slider/thumb.png | Bin 502 -> 0 bytes demo/resource/assets/Slider/track.png | Bin 303 -> 0 bytes demo/resource/assets/Slider/tracklight.png | Bin 313 -> 0 bytes demo/resource/assets/ToggleSwitch/handle.png | Bin 444 -> 0 bytes demo/resource/assets/ToggleSwitch/off.png | Bin 535 -> 0 bytes demo/resource/assets/ToggleSwitch/on.png | Bin 536 -> 0 bytes demo/resource/assets/backgroundSet.png | Bin 9664 -> 0 bytes demo/resource/assets/bg.jpg | Bin 138805 -> 0 bytes demo/resource/assets/block.png | Bin 137 -> 0 bytes demo/resource/assets/buttonHelp.png | Bin 2567 -> 0 bytes demo/resource/assets/buttonStart.png | Bin 2668 -> 0 bytes demo/resource/assets/cloud.png | Bin 1674 -> 0 bytes demo/resource/assets/egret_icon.png | Bin 4296 -> 0 bytes demo/resource/assets/gem.png | Bin 1171 -> 0 bytes demo/resource/assets/heart.png | Bin 1367 -> 0 bytes demo/resource/assets/helpBackground.png | Bin 47994 -> 0 bytes .../assets/isometric_grass_and_water.json | 345 - .../assets/isometric_grass_and_water.png | Bin 104828 -> 0 bytes demo/resource/assets/shield.png | Bin 1702 -> 0 bytes demo/resource/assets/title.json | 281 - demo/resource/assets/title.png | Bin 12428 -> 0 bytes demo/resource/config/description.json | 5 - demo/resource/default.res.json | 167 +- demo/resource/eui_skins/ButtonSkin.exml | 10 - demo/resource/eui_skins/CheckBoxSkin.exml | 16 - demo/resource/eui_skins/HScrollBarSkin.exml | 4 - demo/resource/eui_skins/HSliderSkin.exml | 6 - demo/resource/eui_skins/ItemRendererSkin.exml | 9 - demo/resource/eui_skins/PanelSkin.exml | 10 - demo/resource/eui_skins/ProgressBarSkin.exml | 9 - demo/resource/eui_skins/RadioButtonSkin.exml | 16 - demo/resource/eui_skins/ScrollerSkin.exml | 5 - demo/resource/eui_skins/TextInputSkin.exml | 9 - demo/resource/eui_skins/ToggleSwitchSkin.exml | 13 - demo/resource/eui_skins/VScrollBarSkin.exml | 4 - demo/resource/eui_skins/VSliderSkin.exml | 5 - demo/resource/fgui/common.fui | Bin 0 -> 470 bytes demo/resource/fgui/loading.fui | Bin 0 -> 919 bytes demo/resource/fgui/sc.fui | Bin 0 -> 1046 bytes demo/resource/preload/bg.png | Bin 0 -> 8070 bytes demo/resource/preload/bgNorm.png | Bin 0 -> 29178 bytes demo/resource/preload/moon.png | Bin 0 -> 1372 bytes demo/resource/preload/moonNorm.png | Bin 0 -> 22960 bytes demo/resource/preload/orange.png | Bin 0 -> 26404 bytes demo/resource/preload/orangeNorm.png | Bin 0 -> 62143 bytes .../orthogonal-outside.json | 0 demo/src/Fgui/common/UI_com_tips.ts | 19 + demo/src/Fgui/common/commonBinder.ts | 10 + demo/src/Fgui/loading/UI_View_loading.ts | 21 + demo/src/Fgui/loading/loadingBinder.ts | 10 + demo/src/Fgui/sc/UI_View_sc.ts | 19 + demo/src/Fgui/sc/UI_btn_sc.ts | 19 + demo/src/Fgui/sc/scBinder.ts | 11 + demo/src/LoadingUI.ts | 51 - demo/src/Main.ts | 36 +- demo/src/SampleHelpers/SampleScene.ts | 35 + .../Animated Tiles/AnimatedTilesScene.ts | 21 + demo/src/Scenes/Empty Scene/BasicScene.ts | 8 + demo/src/UI/PopManager.ts | 25 + demo/src/UI/loading/LoadingControl.ts | 27 + demo/src/UI/loading/LoadingEvents.ts | 5 + demo/src/UI/loading/LoadingView.ts | 59 + demo/src/UI/mvc/BaseView.ts | 101 + demo/src/UI/mvc/EventManager.ts | 104 + demo/src/UI/mvc/Extension.ts | 389 + demo/src/UI/mvc/FguiUtils.ts | 25 + demo/src/UI/mvc/LayerManager.ts | 46 + demo/src/UI/mvc/ViewManager.ts | 125 + demo/src/UI/sc/ScControl.ts | 27 + demo/src/UI/sc/ScEvents.ts | 5 + demo/src/UI/sc/ScView.ts | 55 + demo/src/game/MainScene.ts | 102 - demo/src/game/PlayerController.ts | 66 - demo/src/game/SimplePooled.ts | 9 - demo/src/game/SpawnerComponent.ts | 37 - demo/src/game/SpawnerSystem.ts | 36 - demo/template/runtime/native_require.js | 2 +- demo_fgui/.objs/fonts.json | 0 demo_fgui/assets/common/com_tips.xml | 12 + demo_fgui/assets/common/package.xml | 7 + demo_fgui/assets/loading/View_loading.xml | 12 + demo_fgui/assets/loading/package.xml | 8 + demo_fgui/assets/loading/组件/pg_loading.xml | 10 + demo_fgui/assets/sc/View_sc.xml | 6 + demo_fgui/assets/sc/package.xml | 8 + demo_fgui/assets/sc/组件/btn_sc.xml | 22 + demo_fgui/demo_fgui.fairy | 2 + demo_fgui/settings/Adaptation.json | 8 + demo_fgui/settings/Common.json | 24 + demo_fgui/settings/CustomProperties.json | 1 + demo_fgui/settings/Publish.json | 35 + demo_fgui/settings/i18n.json | 3 + {demo => source}/.idea/.gitignore | 2 +- {demo => source}/.idea/misc.xml | 0 {demo => source}/.idea/modules.xml | 2 +- .../.idea/demo.iml => source/.idea/source.iml | 6 +- {demo => source}/.idea/vcs.xml | 0 source/bin/framework.d.ts | 19 + source/bin/framework.js | 150 +- source/bin/framework.min.js | 2 +- source/gulpfile.js | 2 +- source/package-lock.json | 2364 +- .../src/ECS/Components/RenderableComponent.ts | 3 + source/src/ECS/Entity.ts | 7 + source/src/ECS/Utils/ComponentList.ts | 7 + source/src/Graphics/Renderers/IRenderable.ts | 5 + .../Renderers/RenderLayerExcludeRenderer.ts | 40 + source/src/Graphics/Renderers/Renderer.ts | 30 + .../Graphics/Renderers/ScreenSpaceRenderer.ts | 40 + source/src/Tiled/TiledMapLoader.ts | 14 +- 144 files changed, 51196 insertions(+), 2531 deletions(-) delete mode 100644 demo/.vscode/tasks.json delete mode 100644 demo/.wing/launch.json delete mode 100644 demo/.wing/settings.json delete mode 100644 demo/.wing/tasks.json create mode 100644 demo/libs/fairygui/fairygui.d.ts create mode 100644 demo/libs/fairygui/fairygui.js create mode 100644 demo/libs/fairygui/fairygui.min.js create mode 100644 demo/libs/modules/dragonBones/dragonBones.d.ts create mode 100644 demo/libs/modules/dragonBones/dragonBones.js create mode 100644 demo/libs/modules/dragonBones/dragonBones.min.js delete mode 100644 demo/resource/assets/Button/button_down.png delete mode 100644 demo/resource/assets/Button/button_up.png delete mode 100644 demo/resource/assets/CheckBox/checkbox_select_disabled.png delete mode 100644 demo/resource/assets/CheckBox/checkbox_select_down.png delete mode 100644 demo/resource/assets/CheckBox/checkbox_select_up.png delete mode 100644 demo/resource/assets/CheckBox/checkbox_unselect.png delete mode 100644 demo/resource/assets/ItemRenderer/selected.png delete mode 100644 demo/resource/assets/Panel/border.png delete mode 100644 demo/resource/assets/Panel/header.png delete mode 100644 demo/resource/assets/ProgressBar/thumb_pb.png delete mode 100644 demo/resource/assets/ProgressBar/track_pb.png delete mode 100644 demo/resource/assets/RadioButton/radiobutton_select_disabled.png delete mode 100644 demo/resource/assets/RadioButton/radiobutton_select_down.png delete mode 100644 demo/resource/assets/RadioButton/radiobutton_select_up.png delete mode 100644 demo/resource/assets/RadioButton/radiobutton_unselect.png delete mode 100644 demo/resource/assets/ScrollBar/roundthumb.png delete mode 100644 demo/resource/assets/ScrollBar/track_sb.png delete mode 100644 demo/resource/assets/Slider/thumb.png delete mode 100644 demo/resource/assets/Slider/track.png delete mode 100644 demo/resource/assets/Slider/tracklight.png delete mode 100644 demo/resource/assets/ToggleSwitch/handle.png delete mode 100644 demo/resource/assets/ToggleSwitch/off.png delete mode 100644 demo/resource/assets/ToggleSwitch/on.png delete mode 100644 demo/resource/assets/backgroundSet.png delete mode 100644 demo/resource/assets/bg.jpg delete mode 100644 demo/resource/assets/block.png delete mode 100644 demo/resource/assets/buttonHelp.png delete mode 100644 demo/resource/assets/buttonStart.png delete mode 100644 demo/resource/assets/cloud.png delete mode 100644 demo/resource/assets/egret_icon.png delete mode 100644 demo/resource/assets/gem.png delete mode 100644 demo/resource/assets/heart.png delete mode 100644 demo/resource/assets/helpBackground.png delete mode 100644 demo/resource/assets/isometric_grass_and_water.json delete mode 100644 demo/resource/assets/isometric_grass_and_water.png delete mode 100644 demo/resource/assets/shield.png delete mode 100644 demo/resource/assets/title.json delete mode 100644 demo/resource/assets/title.png delete mode 100644 demo/resource/config/description.json delete mode 100644 demo/resource/eui_skins/ButtonSkin.exml delete mode 100644 demo/resource/eui_skins/CheckBoxSkin.exml delete mode 100644 demo/resource/eui_skins/HScrollBarSkin.exml delete mode 100644 demo/resource/eui_skins/HSliderSkin.exml delete mode 100644 demo/resource/eui_skins/ItemRendererSkin.exml delete mode 100644 demo/resource/eui_skins/PanelSkin.exml delete mode 100644 demo/resource/eui_skins/ProgressBarSkin.exml delete mode 100644 demo/resource/eui_skins/RadioButtonSkin.exml delete mode 100644 demo/resource/eui_skins/ScrollerSkin.exml delete mode 100644 demo/resource/eui_skins/TextInputSkin.exml delete mode 100644 demo/resource/eui_skins/ToggleSwitchSkin.exml delete mode 100644 demo/resource/eui_skins/VScrollBarSkin.exml delete mode 100644 demo/resource/eui_skins/VSliderSkin.exml create mode 100644 demo/resource/fgui/common.fui create mode 100644 demo/resource/fgui/loading.fui create mode 100644 demo/resource/fgui/sc.fui create mode 100644 demo/resource/preload/bg.png create mode 100644 demo/resource/preload/bgNorm.png create mode 100644 demo/resource/preload/moon.png create mode 100644 demo/resource/preload/moonNorm.png create mode 100644 demo/resource/preload/orange.png create mode 100644 demo/resource/preload/orangeNorm.png rename demo/resource/{assets => preload}/orthogonal-outside.json (100%) create mode 100644 demo/src/Fgui/common/UI_com_tips.ts create mode 100644 demo/src/Fgui/common/commonBinder.ts create mode 100644 demo/src/Fgui/loading/UI_View_loading.ts create mode 100644 demo/src/Fgui/loading/loadingBinder.ts create mode 100644 demo/src/Fgui/sc/UI_View_sc.ts create mode 100644 demo/src/Fgui/sc/UI_btn_sc.ts create mode 100644 demo/src/Fgui/sc/scBinder.ts delete mode 100644 demo/src/LoadingUI.ts create mode 100644 demo/src/SampleHelpers/SampleScene.ts create mode 100644 demo/src/Scenes/Animated Tiles/AnimatedTilesScene.ts create mode 100644 demo/src/Scenes/Empty Scene/BasicScene.ts create mode 100644 demo/src/UI/PopManager.ts create mode 100644 demo/src/UI/loading/LoadingControl.ts create mode 100644 demo/src/UI/loading/LoadingEvents.ts create mode 100644 demo/src/UI/loading/LoadingView.ts create mode 100644 demo/src/UI/mvc/BaseView.ts create mode 100644 demo/src/UI/mvc/EventManager.ts create mode 100644 demo/src/UI/mvc/Extension.ts create mode 100644 demo/src/UI/mvc/FguiUtils.ts create mode 100644 demo/src/UI/mvc/LayerManager.ts create mode 100644 demo/src/UI/mvc/ViewManager.ts create mode 100644 demo/src/UI/sc/ScControl.ts create mode 100644 demo/src/UI/sc/ScEvents.ts create mode 100644 demo/src/UI/sc/ScView.ts delete mode 100644 demo/src/game/MainScene.ts delete mode 100644 demo/src/game/PlayerController.ts delete mode 100644 demo/src/game/SimplePooled.ts delete mode 100644 demo/src/game/SpawnerComponent.ts delete mode 100644 demo/src/game/SpawnerSystem.ts create mode 100644 demo_fgui/.objs/fonts.json create mode 100644 demo_fgui/assets/common/com_tips.xml create mode 100644 demo_fgui/assets/common/package.xml create mode 100644 demo_fgui/assets/loading/View_loading.xml create mode 100644 demo_fgui/assets/loading/package.xml create mode 100644 demo_fgui/assets/loading/组件/pg_loading.xml create mode 100644 demo_fgui/assets/sc/View_sc.xml create mode 100644 demo_fgui/assets/sc/package.xml create mode 100644 demo_fgui/assets/sc/组件/btn_sc.xml create mode 100644 demo_fgui/demo_fgui.fairy create mode 100644 demo_fgui/settings/Adaptation.json create mode 100644 demo_fgui/settings/Common.json create mode 100644 demo_fgui/settings/CustomProperties.json create mode 100644 demo_fgui/settings/Publish.json create mode 100644 demo_fgui/settings/i18n.json rename {demo => source}/.idea/.gitignore (61%) rename {demo => source}/.idea/misc.xml (100%) rename {demo => source}/.idea/modules.xml (59%) rename demo/.idea/demo.iml => source/.idea/source.iml (52%) rename {demo => source}/.idea/vcs.xml (100%) create mode 100644 source/src/Graphics/Renderers/RenderLayerExcludeRenderer.ts 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">