1

fb4a421a · wildfirecode · 787fe8fb · fb4a421a · fb4a421a · fb4a421a
Commit fb4a421a authored Jun 17, 2019 by wildfirecode
9 changed files
--- a/.gitignore
+++ b/.gitignore
 node_modules
 debug
+.rpt2_cache
\ No newline at end of file
--- a/README.md
+++ b/README.md
 # shuijf
+## manifest.json
+- fps改成63，提升fps
+- 使用fixedWidth
+- webServiceUrl
+- dataCenterConfig

+## loading.gif
+
+## 
\ No newline at end of file
--- a/assets/scripts/HelloScilla.ts
+++ b/assets/scripts/HelloScilla.ts
@@ -21,6 +21,8 @@ export default class HelloScilla extends ScillaComponent {
 	onAwake() {
 		super.onAwake();

+		console.log('fuck11')
+
 		this.labelRenderer = this.label.getComponent(TextRenderer);
 		this.logoAnimation = this.logo.getComponent(Wave);
 	}

--- a/index.html
+++ b/index.html
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
 	<meta charset="UTF-8">
 	<title>shuijf</title>
 	<meta name="viewport"
-	      content="width=device-width,initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no"/>
-	<meta name="apple-mobile-web-app-capable" content="yes"/>
-	<meta name="full-screen" content="true"/>
-	<meta name="screen-orientation" content="portrait"/>
-	<meta name="x5-fullscreen" content="true"/>
-	<meta name="360-fullscreen" content="true"/>
+		content="width=device-width,initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no" />
+	<meta name="apple-mobile-web-app-capable" content="yes" />
+	<meta name="full-screen" content="true" />
+	<meta name="screen-orientation" content="portrait" />
+	<meta name="x5-fullscreen" content="true" />
+	<meta name="360-fullscreen" content="true" />
 	<style>
-		html, body {
+		html,
+		body,
+		p {
 			padding: 0;
 			margin: 0;
 			border: 0;
+		}

+		html,
+		body {
 			height: 100%;
 			background-color: #282C34;
 		}
+
+		#loading {
+			position: absolute;
+			left: 0;
+			right: 0;
+			top: 0;
+			bottom: 0;
+			display: flex;
+			display: -webkit-flex;
+			justify-content: center;
+			-webkit-justify-content: center;
+			align-items: center;
+			-webkit-align-items: center;
+		}
+
+		#floatLayer::-webkit-scrollbar {
+			display: none
+		}
 	</style>
 </head>
+
 <body>
-<div id="gameContainer" style="width: 100%;height: 100%;overflow: hidden;"></div>
-<script src="debug/bundle.js"></script>
-<script>
-	setTimeout(function(){
-		var options = window['inputOptions'] || {};
-		window['shuijf'].startup(document.getElementById('gameContainer'), options);
+
+	<div id="gameContainer" style="width: 100%;height: 100%;overflow: hidden;"></div>
+	<div id="loading">
+		<img src="loading.gif" />
+	</div>
+	<script src="./zepto.min.js"></script>
+	<script src="./security.js"></script>
+	<script src="debug/bundle.js"></script>
+	<script>
+		var CFG = { "actId": "3335069", "oaId": "3335069", "unitName": "积分", "btnUnitName": "积分", "doJoin": "/hdtool/doJoin?dpm=1.3.1.0&activityId=3335069", "quireOrder": "/hdtool/getOrderStatus", "styleConfig": "/hdtool/getHdtoolConfig", "getElement": "/hdtool/ajaxElement", "getPrizeDetail": "/hdtool/prizeDetail", "ajaxThroughInfo": "/hdtool/ajaxThroughInfo", "throughSubmit": "/hdtool/throughSubmit", "gameGetOrder": "/hdtool/getOrderInfo", "gameSubmit": "/hdtool/gameSubmit", "doSubmit": "/hdtool/submit", "adslotId": "", "consumerId": "1", "isNotLoginUser": false, "uid": "1", "hdType": "duiba", "hdToolId": "42363", "appType": "credits", "subType": "custom", "directSendCoupon": "false", "ajaxAction": "", "recommendQueue": "/recommend/getRecommend", "recommendSkin": "/recommend/getRecommendSkin", "isShowDetail": true, "preview": false, "from": "", "login": "//activity.m.duiba.com.cn/hdtool/login?dpm=1.3.3.0", "flowRedirectUrl": "", "flowRedirectTuiaUrl": "", "isOpenRecommend": false, "getCreditsLink": "http://baidu.com?uid=1&dbnewopen", "appId": "1", "recordUrl": "//activity.m.duiba.com.cn/crecord/record?dbnewopen&dpm=1.3.2.0", "shareDesc": "分享分享文案文案", "entranceDesc": "测试领奖，也可到我的奖品领奖，24小时内有效哦", "isSHowMeat": true, "needCouponModal": true, "needRecommendModal": true, "asyncFiles": [], "shareAndroidLinkActivity": "http://www.duiba.com.cn", "shareIosLinkActivity": "http://www.iqiyi.com", "appName": "custom", "needShare": true, "shareTitle": "", "shareSubTitle": "", "sharePicUrl": "", "shareLink": "", "shareAndroidDeeplink": "", "shareIOSDeeplink": "" };
+
+		function requirelogin() {
+			console.log('requirelogin');
+		}
+
+		setTimeout(function () {
+			var loadingEl = document.getElementById('loading');
+
+			function onProcess(p) {
+				if (p >= 1) {
+					loadingEl.style.display = 'none';
+				}
+			}
+
+			var options = {};//window['inputOptions'] ||
+			window['shuijf'].startup(document.getElementById('gameContainer'), options, onProcess);
 		}, 100);
-</script>
+	</script>
+	<script>
+		document.write('<script src="http://' + (location.host || 'localhost').split(':')[0] +
+			':35729/livereload.js?snipver=1"></' + 'script>')
+	</script>
 </body>
+
 </html>
\ No newline at end of file
--- a/loading.gif
+++ b/loading.gif
--- a/manifest.json
+++ b/manifest.json
 {
 	"name": "shuijf",
 	"engineConfig": {
-		"fps": 60,
+		"fps": 63,
 		"designWidth": 750,
 		"designHeight": 1334,
-		"scaleMode": "showAll",
+		"scaleMode": "fixedWidth",
 		"modifyCanvasSize": false,
 		"resPath": ""
 	},
@@ -15,6 +15,13 @@
 			},
 			"entryScene": "main"
 		},
+		"webServiceUrl-": "http://10.10.93.204:7555 http://localhost:3010",
 		"webServiceUrl": "http://localhost:4001"
+	},
+	"dataCenterConfig": {
+		"dataCenterRoot": [
+			"API",
+			"CFG"
+		]
 	}
 }
--- a/package.json
+++ b/package.json
@@ -4,7 +4,10 @@
 	"main": "index.js",
 	"license": "MIT",
 	"scripts": {
-		"mock": "game-cli m -p 4001 -f './mock' "
+		"livereload": "livereload . -ee scene,jpg,png,html",
+		"mock": "game-cli m -p 4001 -f './mock'",
+		"server": "game-cli serve -p 3001",
+		"dev": "game-cli dev"
 	},
 	"build": {
 		"build-process": "scilla",
@@ -17,5 +20,8 @@
 		"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",
+		"tslib": "^1.9.3"
+	}
 }
\ No newline at end of file
--- a/security.js
+++ b/security.js
--- a/zepto.min.js
+++ b/zepto.min.js