1

.gitignore

 debug
+node_modules
\ No newline at end of file

assets/scripts/MainController.ts

-import ScillaComponent from "components/base/ScillaComponent";
-import { dynamic, engine, Entity } from "scilla";
+import ScillaComponent from "scilla-components/src/base/ScillaComponent";
+import { dynamic, engine, Entity } from "scilla/src";
 import Toast from "./common/Toast";
 import { initEnv } from "./common/BuriedPoint";
 import Popup from "./popup/Popup";

assets/scripts/api/ApiComponent.ts

@@ -4,8 +4,8 @@
  * Api接口组件基类
  */
 
-import {engine, ScillaEvent} from "scilla";
-import ScillaComponent from "components/base/ScillaComponent";
+import {engine, ScillaEvent} from "scilla/src";
+import ScillaComponent from "scilla-components/src/base/ScillaComponent";
 
 export enum RequestMethod{
 	GET = 'GET',

assets/scripts/api/SampleApi.ts

@@ -4,7 +4,7 @@
  * 简单的api组件
  */
 
-import {utils, } from 'scilla'
+import {utils, } from 'scilla/src'
 import ApiComponent from "./ApiComponent";
 import {callApi} from "../net/webService";
 

assets/scripts/api/SamplePollingApi.ts

@@ -4,7 +4,7 @@
  * 轮询api组件
  */
 
-import {raw, utils,} from 'scilla'
+import {raw, utils,} from 'scilla/src'
 import ApiComponent from "./ApiComponent";
 import { polling} from "../net/webService";
 

assets/scripts/common/BuriedPoint.ts

@@ -3,9 +3,9 @@
  *
  * 埋点按钮
  */
-import InteractComponent from "components/base/InteractComponent";
+import InteractComponent from "scilla-components/src/base/InteractComponent";
 import {callApi} from "../net/webService";
-import {engine} from "scilla";
+import {engine} from "scilla/src";
 
 export default class BuriedPoint extends InteractComponent {
 	dpm: string;

assets/scripts/common/Toast.ts

@@ -4,10 +4,10 @@
  * Toast
  */
 
-import {Entity, createTween, Tween, ease, engine,} from "scilla";
-import ScillaComponent from "components/base/ScillaComponent";
-import TextRenderer from "components/renderer/TextRenderer";
-import Transform from "components/base/Transform";
+import {Entity, createTween, Tween, ease, engine,} from "scilla/src";
+import ScillaComponent from "scilla-components/src/base/ScillaComponent";
+import TextRenderer from "scilla-components/src/renderer/TextRenderer";
+import Transform from "scilla-components/src/base/Transform";
 
 export default class Toast extends ScillaComponent {
 	Label: Entity;

assets/scripts/dialogs/GameOverPanel.ts

-import ScillaComponent from 'components/base/ScillaComponent';
+import ScillaComponent from 'scilla-components/src/base/ScillaComponent';
 
 export default class GameOverPanel extends ScillaComponent{
 	onAwake(){

assets/scripts/dialogs/RuleDialogContent.ts

@@ -4,8 +4,8 @@
  * 规则对话框内容
  */
 
-import HtmlRenderer from "components/renderer/HtmlRenderer";
-import { dynamic, Entity } from "scilla";
+import HtmlRenderer from "scilla-components/src/renderer/HtmlRenderer";
+import { dynamic, Entity } from "scilla/src";
 import DialogContent from "../popup/DialogContent";
 
 export default class RuleDialogContent extends DialogContent {

assets/scripts/game/CustomTextRenderer.ts

@@ -4,7 +4,7 @@
  * 自定义文本渲染器
  */
 
-import TextRenderer from "components/renderer/TextRenderer";
+import TextRenderer from "scilla-components/src/renderer/TextRenderer";
 
 export default class CustomTextRenderer extends TextRenderer {
 }

assets/scripts/navigator/Navigator.ts

@@ -4,7 +4,7 @@
  * 场景导航器
  */
 
-import {EventEmitter} from 'scilla'
+import {EventEmitter} from 'scilla/src'
 
 import {alien} from "./StackNavigator";
 import NavigatorAction = alien.NavigatorAction;

assets/scripts/navigator/SingleSceneNavigator.ts

@@ -6,7 +6,7 @@
 
 import {VirtualNavigator} from "./VirtualNavigator";
 import {SceneStart, ScenePlay} from "../scenes";
-import ScillaComponent from "components/base/ScillaComponent";
+import ScillaComponent from "scilla-components/src/base/ScillaComponent";
 
 export default class SingleSceneNavigator extends ScillaComponent {
 	_navigator: VirtualNavigator;

assets/scripts/navigator/VirtualNavigator.ts

@@ -4,7 +4,7 @@
  * 场景导航器
  */
 
-import {Entity, EventEmitter} from 'scilla'
+import {Entity, EventEmitter} from 'scilla/src'
 
 import {alien} from "./StackNavigator";
 import NavigatorAction = alien.NavigatorAction;

assets/scripts/net/webService.ts

@@ -3,7 +3,7 @@
  * 网络组件
  */
 
-import {utils, engine} from "scilla";
+import {utils, engine} from "scilla/src";
 
 /**
  * 调用接口

assets/scripts/popup/DialogContent.ts

@@ -4,10 +4,10 @@
  * 对话框内容组件
  */
 
-import ScillaComponent from "components/base/ScillaComponent";
+import ScillaComponent from "scilla-components/src/base/ScillaComponent";
 import { fade, flew, none, zoom } from "./PopupEffect";
-import { raw } from "scilla";
-import { decorators } from "scilla";
+import { raw } from "scilla/src";
+import { decorators } from "scilla/src";
 import { Button } from "scilla-components/src";
 
 const { dirtyFieldTrigger } = decorators;

assets/scripts/popup/Popup.ts

@@ -5,12 +5,12 @@
  */
 
 import DialogContent from "./DialogContent";
-import RectRenderer from "components/renderer/RectRenderer";
-import TouchInterrupt from "components/base/TouchInterrupt";
-import Transform from "components/base/Transform";
-import ScillaComponent from "components/base/ScillaComponent";
+import RectRenderer from "scilla-components/src/renderer/RectRenderer";
+import TouchInterrupt from "scilla-components/src/base/TouchInterrupt";
+import Transform from "scilla-components/src/base/Transform";
+import ScillaComponent from "scilla-components/src/base/ScillaComponent";
 import {none} from "./PopupEffect";
-import {createTween} from "scilla";
+import {createTween} from "scilla/src";
 
 export default class Popup extends ScillaComponent {
 	blackLayerDuration = 300;

assets/scripts/popup/PopupEffect.ts

 /**
  * Created by rockyl on 2019-05-15.
  */
-import Transform from "components/base/Transform";
-import {createTween, ease, engine} from "scilla";
+import Transform from "scilla-components/src/base/Transform";
+import {createTween, ease, engine} from "scilla/src";
 
 function bearingsToOutPos(bearings) {
 	const {width, height} = engine.renderContext.stageSize;

assets/scripts/scenes/SceneController.ts

-import ScillaComponent from 'components/base/ScillaComponent';
+import ScillaComponent from 'scilla-components/src/base/ScillaComponent';
 import SingleSceneNavigator from '../navigator/SingleSceneNavigator';
 
 export default class SceneController extends ScillaComponent{

assets/scripts/scenes/ScenePlay.ts

-import ScillaComponent from "components/base/ScillaComponent";
+import ScillaComponent from "scilla-components/src/base/ScillaComponent";
 import { alien } from "../navigator/StackNavigator";
 import { INavigatorViewBase } from "../navigator/VirtualNavigator";
 

assets/scripts/scenes/SceneStart.ts

@@ -2,8 +2,8 @@
  * Created by rockyl on 2019-04-09.
  */
 
-import ScillaComponent from "components/base/ScillaComponent";
-import { dynamic, Entity } from "scilla";
+import ScillaComponent from "scilla-components/src/base/ScillaComponent";
+import { dynamic, Entity } from "scilla/src";
 import { setText } from "../entityUtils";
 import { alien } from "../navigator/StackNavigator";
 import { INavigatorViewBase } from "../navigator/VirtualNavigator";

node_modules/scilla/src/core/Sheet.ts

@@ -2,7 +2,7 @@
  * Created by rockyl on 2018-11-30.
  */
 
-import HashObject from "../core/HashObject";
+import HashObject from "./HashObject";
 import Texture, {createTexture} from "./Texture";
 import {Frame} from "../ReType";
 

node_modules/scilla/src/core/Texture.ts

@@ -3,7 +3,7 @@
  */
 
 import Bounds from "../support/Bounds";
-import HashObject from "../core/HashObject";
+import HashObject from "./HashObject";
 import {createCanvas} from "./context/RenderContext";
 import {Frame} from "../ReType";
 

node_modules/scilla/src/core/interpreter.ts

@@ -4,8 +4,8 @@
  * 配置文件解释器
  */
 
-import {Entity} from "../core/Entity";
-import {ScillaEvent} from "../core/ScillaEvent";
+import {Entity} from "./Entity";
+import {ScillaEvent} from "./ScillaEvent";
 import {EngineConfig} from "../engine-config";
 import engine from "./ScillaEngine";
 

package.json

@@ -18,5 +18,7 @@
 		"scilla-components": "git+http://gitlab2.dui88.com/laoqifeng/scilla-components#dev",
 		"scilla-launcher": "git+http://gitlab2.dui88.com/laoqifeng/scilla-launcher#dev"
 	},
-	"devDependencies": {}
+	"devDependencies": {
+		"livereload": "^0.8.0"
+	}
 }

src/GlobalEvent.ts

@@ -2,7 +2,7 @@
  * Created by rockyl on 2018-12-12.
  */
 
-import {EventEmitter} from 'scilla'
+import {EventEmitter} from 'scilla/src'
 
 const eventEmitter = new EventEmitter();
 

src/LaunchOptions.ts

@@ -4,7 +4,7 @@
 
 import {
 	utils,
-} from 'scilla'
+} from 'scilla/src'
 
 const options: any = {};
 

src/generated/MustCompile.ts

@@ -3,42 +3,42 @@
  * DO NOT MODIFY THIS FILE
  */
  
-import {registerDef} from 'scilla'
+import {registerDef} from 'scilla/src'
 
-import component0 from 'components/other/CameraController';
+import component0 from 'scilla-components/src/other/CameraController';
 registerDef('components/other/CameraController', component0);
 
-import component1 from 'components/base/Transform';
+import component1 from 'scilla-components/src/base/Transform';
 registerDef('components/base/Transform', component1);
 
-import component2 from 'components/renderer/TextureRenderer';
+import component2 from 'scilla-components/src/renderer/TextureRenderer';
 registerDef('components/renderer/TextureRenderer', component2);
 
-import component3 from 'components/renderer/TextRenderer';
+import component3 from 'scilla-components/src/renderer/TextRenderer';
 registerDef('components/renderer/TextRenderer', component3);
 
-import component4 from 'components/animation/TouchZoom';
+import component4 from 'scilla-components/src/animation/TouchZoom';
 registerDef('components/animation/TouchZoom', component4);
 
-import component5 from 'components/ui/Button';
+import component5 from 'scilla-components/src/ui/Button';
 registerDef('components/ui/Button', component5);
 
-import component6 from 'components/other/FullStageSize';
+import component6 from 'scilla-components/src/other/FullStageSize';
 registerDef('components/other/FullStageSize', component6);
 
-import component7 from 'components/renderer/RectRenderer';
+import component7 from 'scilla-components/src/renderer/RectRenderer';
 registerDef('components/renderer/RectRenderer', component7);
 
-import component8 from 'components/base/TouchInterrupt';
+import component8 from 'scilla-components/src/base/TouchInterrupt';
 registerDef('components/base/TouchInterrupt', component8);
 
-import component9 from 'components/ui/ScrollView';
+import component9 from 'scilla-components/src/ui/ScrollView';
 registerDef('components/ui/ScrollView', component9);
 
-import component10 from 'components/other/RelativeLayout';
+import component10 from 'scilla-components/src/other/RelativeLayout';
 registerDef('components/other/RelativeLayout', component10);
 
-import component11 from 'components/renderer/HtmlRenderer';
+import component11 from 'scilla-components/src/renderer/HtmlRenderer';
 registerDef('components/renderer/HtmlRenderer', component11);
 
 import component12 from '../../assets/scripts/scenes/SceneController';

src/main.ts

@@ -4,8 +4,8 @@
  * 游戏入口
  */
 
-import {modifyEngineConfig} from 'scilla'
-import ScillaLauncher from 'launcher'
+import {modifyEngineConfig} from 'scilla/src'
+import ScillaLauncher from 'scilla-launcher/src'
 import './generated/MustCompile'
 
 let launcher: ScillaLauncher;