1

assets/scenes/main.scene

@@ -419,7 +419,8 @@
 												}
 											}
 										],
-										"uuid": "f4953154-11f1-4399-971c-ba79e09c28db"
+										"uuid": "f4953154-11f1-4399-971c-ba79e09c28db",
+										"disabled": true
 									},
 									{
 										"name": "treewrapper",
@@ -428,8 +429,8 @@
 												"script": "components/base/Transform",
 												"properties": {
 													"position": {
-														"x": 5,
-														"y": -247.2619047619048,
+														"x": -52.77777777777777,
+														"y": 123.84920634920631,
 														"_type_": "scilla/support/Vector2D"
 													}
 												}
@@ -615,7 +616,7 @@
 											}
 										],
 										"uuid": "f85a6212-dc4c-4b71-8c3d-041993b935e1",
-										"disabled": false
+										"disabled": true
 									},
 									{
 										"name": "noname",
@@ -637,7 +638,7 @@
 											}
 										],
 										"uuid": "78c6207b-a7d2-41b6-8ed0-e87b04642dee",
-										"disabled": false
+										"disabled": true
 									},
 									{
 										"name": "roles",
@@ -659,7 +660,7 @@
 											}
 										],
 										"uuid": "d17386f1-a9fc-4125-9b60-37f25801ed21",
-										"disabled": false
+										"disabled": true
 									},
 									{
 										"name": "ruleBtn",
@@ -845,14 +846,15 @@
 												"properties": {
 													"position": {
 														"x": 0,
-														"y": 259
-													}
+														"y": 307.88888888888886
+													},
+													"alpha": 0.9
 												}
 											},
 											{
 												"script": "components/renderer/TextRenderer",
 												"properties": {
-													"text": "理性饮酒",
+													"text": "理性饮酒 杜绝酗酒 禁止向未满18岁消费者出售",
 													"fillColor": "rgba(255, 255, 255, 1)",
 													"textStyle": {
 														"fontSize": 31
@@ -860,7 +862,8 @@
 												}
 											}
 										],
-										"uuid": "1daa1f87-10c0-48a6-9779-5a9ed3f1e2f3"
+										"uuid": "1daa1f87-10c0-48a6-9779-5a9ed3f1e2f3",
+										"disabled": false
 									},
 									{
 										"name": "countTxt",
@@ -870,7 +873,7 @@
 												"properties": {
 													"position": {
 														"x": 0,
-														"y": -541.8311688311687
+														"y": 249.2799422799423
 													}
 												}
 											},
@@ -999,7 +1002,7 @@
 										"disabled": false
 									}
 								],
-								"disabled": false
+								"disabled": true
 							}
 						]
 					},
@@ -1137,7 +1140,7 @@
 												"script": "components/base/Transform",
 												"properties": {
 													"width": 450,
-													"height": 480,
+													"height": 350,
 													"position": {
 														"x": -20,
 														"y": -37,
@@ -1231,10 +1234,10 @@
 												"script": "components/base/Transform",
 												"properties": {
 													"width": 450,
-													"height": 480,
+													"height": 350,
 													"position": {
 														"x": -2.2222222222222285,
-														"y": 42.22222222222223,
+														"y": -25,
 														"_type_": "scilla/support/Vector2D"
 													}
 												}
@@ -1297,8 +1300,8 @@
 												"script": "components/base/Transform",
 												"properties": {
 													"position": {
-														"x": 241.33333333333334,
-														"y": -173.83333333333337,
+														"x": 252.44444444444446,
+														"y": -287.1666666666667,
 														"_type_": "scilla/support/Vector2D"
 													}
 												}
@@ -1334,8 +1337,8 @@
 												"script": "components/base/Transform",
 												"properties": {
 													"position": {
-														"x": -6.166666666666657,
-														"y": 226.16666666666663,
+														"x": -3.944444444444435,
+														"y": 126.16666666666663,
 														"_type_": "scilla/support/Vector2D"
 													}
 												}
@@ -1372,7 +1375,7 @@
 												"properties": {
 													"position": {
 														"x": 0,
-														"y": 60
+														"y": -62.222222222222214
 													}
 												}
 											},
@@ -1380,7 +1383,7 @@
 												"script": "components/renderer/TextRenderer",
 												"properties": {
 													"text": "网络异常",
-													"fillColor": "rgba(255, 255, 255, 1)",
+													"fillColor": "rgba(130, 81, 2, 1)",
 													"textStyle": {
 														"fontSize": 40
 													}
@@ -1622,7 +1625,7 @@
 										"uuid": "f5f89b3f-da91-42ba-ac08-3cda2792bb07"
 									}
 								],
-								"disabled": true
+								"disabled": false
 							}
 						],
 						"disabled": false

assets/scripts/scenes/Drop.ts

@@ -18,7 +18,7 @@ export default class Drop extends ScillaComponent {
 			v.enabled = index == i;
 		});
 		this._v = 3;
-		setY(this.entity, -400);
+		setY(this.entity, -400+50);
 	}
 
 	onUpdate(t) {

index.html

@@ -68,14 +68,13 @@
 			'activity': { id: 1 }
 		};
 
-		window.ruleContent = '<ol>';
-        window.ruleContent += '<li>点击接礼物，礼物树开始掉落奖品;</li>';
-        window.ruleContent += '<li>奖品为随机掉落，接到实物奖品的获奖用户请于获奖当日在宴会现场工作人员处领取奖品，否则视为放弃领奖;</li>';
-        window.ruleContent += '<li>若未在游戏开放时间内或剩余参与次数为0时开始游戏，将无法参与游戏;</li>';
-        window.ruleContent += '<li>点击【我的奖品】可查看获奖情况;</li>';
-        window.ruleContent += '<li>在本次活动期间，如用户存在任何违反法律、法规、水井坊活动规则的行为，包括但不限于作弊得奖等行为，水井坊有权取消用户的中奖资格，有权撤销违规交易;</li>';
-        window.ruleContent += '<li>在法律规定的范围内，水井坊对本次活动拥有最终解释权。</li>';
-		window.ruleContent += '</ol>';
+		window.ruleContent = '';
+    window.ruleContent += '1、点击接礼物，礼物树开始掉落奖品;<br>';
+    window.ruleContent += '2、奖品为随机掉落，接到实物奖品的获奖用户请于获奖当日在宴会现场工作人员处领取奖品，否则视为放弃领奖;<br>';
+    window.ruleContent += '3、若未在游戏开放时间内或剩余参与次数为0时开始游戏，将无法参与游戏;<br>';
+    window.ruleContent += '4、点击【我的奖品】可查看获奖情况;<br>';
+    window.ruleContent += '5、在本次活动期间，如用户存在任何违反法律、法规、水井坊活动规则的行为，包括但不限于作弊得奖等行为，水井坊有权取消用户的中奖资格，有权撤销违规交易;<br>';
+    window.ruleContent += '6、在法律规定的范围内，水井坊对本次活动拥有最终解释权。';
 		function requirelogin() {
 			console.log('requirelogin');
 		}

manifest.json

@@ -16,8 +16,8 @@
 			"entryScene": "main"
 		},
 		"webServiceUrl-": "http://10.10.93.204:7555 http://localhost:3010",
-		"webServiceUrl": "",
-		"webServiceUrl1": "http://localhost:4001"
+		"webServiceUrl1": "",
+		"webServiceUrl": "http://localhost:4001"
 	},
 	"dataCenterConfig": {
 		"dataCenterRoot": [

package.json

@@ -24,4 +24,4 @@
 		"livereload": "^0.8.0",
 		"tslib": "^1.9.3"
 	}
-}
\ No newline at end of file
+}

src/generated/MustCompile.ts

@@ -3,82 +3,82 @@
  * DO NOT MODIFY THIS FILE
  */
  
-import {registerDef} from 'scilla'
+import {engine} from 'scilla'
 
 import component0 from 'components/renderer/TextRenderer';
-registerDef('components/renderer/TextRenderer', component0);
+engine.registerDef('components/renderer/TextRenderer', component0);
 
 import component1 from 'components/base/Transform';
-registerDef('components/base/Transform', component1);
+engine.registerDef('components/base/Transform', component1);
 
 import component2 from 'components/renderer/HtmlRenderer';
-registerDef('components/renderer/HtmlRenderer', component2);
+engine.registerDef('components/renderer/HtmlRenderer', component2);
 
 import component3 from 'components/base/TouchInterrupt';
-registerDef('components/base/TouchInterrupt', component3);
+engine.registerDef('components/base/TouchInterrupt', component3);
 
 import component4 from 'components/ui/Button';
-registerDef('components/ui/Button', component4);
+engine.registerDef('components/ui/Button', component4);
 
 import component5 from 'components/animation/TouchZoom';
-registerDef('components/animation/TouchZoom', component5);
+engine.registerDef('components/animation/TouchZoom', component5);
 
 import component6 from 'components/other/FullStageSize';
-registerDef('components/other/FullStageSize', component6);
+engine.registerDef('components/other/FullStageSize', component6);
 
 import component7 from 'components/other/CameraController';
-registerDef('components/other/CameraController', component7);
+engine.registerDef('components/other/CameraController', component7);
 
 import component8 from 'components/other/RelativeLayout';
-registerDef('components/other/RelativeLayout', component8);
+engine.registerDef('components/other/RelativeLayout', component8);
 
 import component9 from 'components/renderer/TextureRenderer';
-registerDef('components/renderer/TextureRenderer', component9);
+engine.registerDef('components/renderer/TextureRenderer', component9);
 
 import component10 from 'components/renderer/RectRenderer';
-registerDef('components/renderer/RectRenderer', component10);
+engine.registerDef('components/renderer/RectRenderer', component10);
 
 import component11 from 'components/ui/ScrollView';
-registerDef('components/ui/ScrollView', component11);
+engine.registerDef('components/ui/ScrollView', component11);
 
 import component12 from '../../assets/scripts/dialogs/RuleDialogContent';
-registerDef('./scripts/dialogs/RuleDialogContent', component12);
+engine.registerDef('./scripts/dialogs/RuleDialogContent', component12);
 
 import component13 from '../../assets/scripts/api/SamplePollingApi';
-registerDef('./scripts/api/SamplePollingApi', component13);
+engine.registerDef('./scripts/api/SamplePollingApi', component13);
 
 import component14 from '../../assets/scripts/navigator/SingleSceneNavigator';
-registerDef('./scripts/navigator/SingleSceneNavigator', component14);
+engine.registerDef('./scripts/navigator/SingleSceneNavigator', component14);
 
 import component15 from '../../assets/scripts/scenes/SceneController';
-registerDef('./scripts/scenes/SceneController', component15);
+engine.registerDef('./scripts/scenes/SceneController', component15);
 
 import component16 from '../../assets/scripts/Rotation';
-registerDef('./scripts/Rotation', component16);
+engine.registerDef('./scripts/Rotation', component16);
 
 import component17 from '../../assets/scripts/popup/Popup';
-registerDef('./scripts/popup/Popup', component17);
+engine.registerDef('./scripts/popup/Popup', component17);
 
 import component18 from '../../assets/scripts/api/SampleApi';
-registerDef('./scripts/api/SampleApi', component18);
+engine.registerDef('./scripts/api/SampleApi', component18);
 
 import component19 from '../../assets/scripts/scenes/SceneStart';
-registerDef('./scripts/scenes/SceneStart', component19);
+engine.registerDef('./scripts/scenes/SceneStart', component19);
 
 import component20 from '../../assets/scripts/game/CustomTextRenderer';
-registerDef('./scripts/game/CustomTextRenderer', component20);
+engine.registerDef('./scripts/game/CustomTextRenderer', component20);
 
 import component21 from '../../assets/scripts/MainController';
-registerDef('./scripts/MainController', component21);
+engine.registerDef('./scripts/MainController', component21);
 
 import component22 from '../../assets/scripts/dialogs/AlertDialogContent';
-registerDef('./scripts/dialogs/AlertDialogContent', component22);
+engine.registerDef('./scripts/dialogs/AlertDialogContent', component22);
 
 import component23 from '../../assets/scripts/dialogs/PrizeDialogContent';
-registerDef('./scripts/dialogs/PrizeDialogContent', component23);
+engine.registerDef('./scripts/dialogs/PrizeDialogContent', component23);
 
 import component24 from '../../assets/scripts/common/Toast';
-registerDef('./scripts/common/Toast', component24);
+engine.registerDef('./scripts/common/Toast', component24);
 
 import component25 from '../../assets/scripts/scenes/Drop';
-registerDef('./scripts/scenes/Drop', component25);
+engine.registerDef('./scripts/scenes/Drop', component25);