CocosPlugin/esengine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/esengine/egret-framework

Browse Source 
# Conflicts:
#	demo/libs/framework/framework.min.js
This commit is contained in:
yhh
2020-11-03 10:10:03 +08:00
parent 7268ebab4a 8191359953
commit 8b423310a6
16 changed files with 148 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
demo/manifest.json
View File

@@ -17,7 +17,7 @@
"bin-debug/SampleHelpers/SampleScene.js",
"bin-debug/Scenes/NinjaAdventure/ProjectileHitDetector.js",
"bin-debug/UI/loading/LoadingView.js",
"bin-debug/Scenes/LineCasting/LineCastingScene.js",
"bin-debug/Scenes/NinjaAdventure/CameraBounds.js",
"bin-debug/Fgui/loading/loadingBinder.js",
"bin-debug/Fgui/loading/UI_View_loading.js",
"bin-debug/Fgui/sc/scBinder.js",
@@ -28,10 +28,9 @@
"bin-debug/Scenes/AnimatedTiles/AnimatedTilesScene.js",
"bin-debug/Scenes/EmptyScene/BasicScene.js",
"bin-debug/Scenes/GOAP/GoapScene.js",
"bin-debug/Scenes/GOAP/QuickAgent.js",
"bin-debug/Scenes/LineCasting/LineCaster.js",
"bin-debug/Scenes/LineCasting/LineCastingScene.js",
"bin-debug/Main.js",
"bin-debug/Scenes/NinjaAdventure/CameraBounds.js",
"bin-debug/Scenes/NinjaAdventure/FireballProjectileController.js",
"bin-debug/Scenes/NinjaAdventure/Ninja.js",
"bin-debug/Scenes/NinjaAdventure/NinjaAdventureScene.js",