--

0267e5e3 · 任建锋 · 3b22e4e5 · 0267e5e3 · 0267e5e3 · 0267e5e3
Commit 0267e5e3 authored Jul 02, 2019 by 任建锋
67 changed files
--- a/.history/assets/scripts/scenes/SceneStart_20190702170804.ts
+++ b/.history/assets/scripts/scenes/SceneStart_20190702170804.ts
--- a/.history/assets/scripts/scenes/SceneStart_20190702170822.ts
+++ b/.history/assets/scripts/scenes/SceneStart_20190702170822.ts
--- a/.history/assets/scripts/scenes/SceneStart_20190702170841.ts
+++ b/.history/assets/scripts/scenes/SceneStart_20190702170841.ts
--- a/.history/assets/scripts/scenes/SceneStart_20190702170939.ts
+++ b/.history/assets/scripts/scenes/SceneStart_20190702170939.ts
--- a/.history/assets/scripts/scenes/SceneStart_20190702171000.ts
+++ b/.history/assets/scripts/scenes/SceneStart_20190702171000.ts
--- a/.history/index.1_20190702171303.html
+++ b/.history/index.1_20190702171303.html
+<head>
+	<meta charset="UTF-8">
+	<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" />
+	<style>
+		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;
+			color:#fff;
+		}
+		#floatLayer::-webkit-scrollbar {
+			display: none
+		}
+	</style>
+</head>
+	<script src="//yun.duiba.com.cn/db_games/activity/public_js/fetch-jsonp.min.js"></script>
+<!-- 	<script src="//yun.duiba.com.cn/db_games/activity/public_js/fetch.min.js"></script>
+ -->		
+	<div id="gameContainer" style="width: 100%;height: 100%;overflow: hidden;"></div>
+	<audio id="bgmusic" src="//yun.duiba.com.cn/db_games/activity/wwjsjf-20190619/wawaji.mp3" autoplay preload loop></audio>
+	<div id="loading">
+		加载中...
+	</div>
+	<script src="//yun.duiba.com.cn/db_games/activity/wx_test/zepto.min.js"></script>
+	<script src="//yun.duiba.com.cn/db_games/activity/wwjsjf-20190619/downloadApp.js"></script>
+	<script src="//yun.duiba.com.cn/db_games/activity/wx_test/security.js"></script>
+	<script src="//yun.duiba.com.cn/db_games/activity/wwjsjf-20190619/1562058643/bundle.js"></script>
+	<script src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
+	<script>
+		function requirelogin() {
+			console.log('requirelogin');
+		}
+		var rule="1、点击开始即可开始抓奖品；<br><br>2、奖品为随机抓取，抓到实物奖品的获奖用户请于获奖当日在宴会现场工作人员处领取奖品，否则视为放弃领奖；<br><br>3、若未在游戏开放时间内或剩余参与次数为0时开始游戏，将无法参与游戏；<br><br>4、点击【我的奖品】可查看获奖情况；<br><br>5、在本次活动期间，如用户存在任何违反法律、法规、水井坊活动规则的行为，包括但不限于作弊得奖等行为，水井坊有权取消用户的中奖资格，有权撤销违规交易；<br><br>6、在法律规定的范围内，水井坊对本次活动拥有最终解释权。";
+		setTimeout(function () {
+			var loadingEl = document.getElementById('loading');
+			function onProcess(p) {
+				if (p >= 1) {
+					loadingEl.style.display = 'none';
+				}
+			}
+			var options = {
+				resPath:"//yun.duiba.com.cn/db_games/activity/wwjsjf-20190619/1562058643/"
+			};
+			window['new-kickball'].startup(document.getElementById('gameContainer'), options, onProcess);
+		}, 100);
+		function autoPlayAudio() {
+			var ua = navigator.userAgent.toLowerCase();
+			if (ua.match(/MicroMessenger/i)) {
+				wx.config({
+					debug: false,
+					appId: '',
+					timestamp: 1,
+					nonceStr: '',
+					signature: '',
+					jsApiList: []
+				});
+				wx.ready(function() {
+					try {
+						document.getElementById('bgmusic').play();
+					} catch (error) {
+					}
+				});
+			} else {
+				window.onload=function(){
+					try {
+						document.getElementById('bgmusic').play();
+					} catch (error) {
+					}
+				}
+			}
+		}
+		document.addEventListener("WeixinJSBridgeReady", function () {//微信  
+			try {
+				document.getElementById('bgmusic').play();
+			} catch (error) {
+			}
+		}, false);
+		autoPlayAudio();
+	    // 推荐使用方法1
+	</script>
--- a/assets/scenes/main.scene
+++ b/assets/scenes/main.scene
@@ -1048,8 +1048,8 @@
 														"y": 58,
 														"_type_": "scilla/support/Vector2D"
 													},
-													"width": 50,
+													"width": 200,
-													"height": 50
+													"height": 200
 												}
 											},
 											{

--- a/assets/scripts/scenes/SceneStart.ts
+++ b/assets/scripts/scenes/SceneStart.ts
@@ -79,7 +79,16 @@ export default class SceneStart extends ScillaComponent implements INavigatorVie
 	}
+	musicAn
 	playAnimation(){
+		this.musicAn=createTween(this, this.musicOnTransform,true,{loop:-1})
+		.set({rotation:0})
+		.to({rotation:-360},2000)
 		createTween(this, this.pingziBackTransform,true,{loop:-1})
 		.set({position: {x: 47.5}})
 		.to({position: {x: -152.5}},1000)
@@ -288,10 +297,12 @@ export default class SceneStart extends ScillaComponent implements INavigatorVie
 	onClick_musicbtn(){
 		this.musicPlaying=!this.musicPlaying;
 		if(this.musicPlaying){
+			this.musicAn.stop()
 			this.musicOffTransform.alpha=1;
 			this.musicOnTransform.alpha=0;
 			document.getElementById('bgmusic')["pause"]();
 		}else{
+			this.musicAn.play()
 			this.musicOffTransform.alpha=0;
 			this.musicOnTransform.alpha=1;
 			document.getElementById('bgmusic')["play"]();

--- a/dist/1562058643/assets/scenes/main.scene
+++ b/dist/1562058643/assets/scenes/main.scene
--- a/dist/1562058643/assets/sheets/gameover.png
+++ b/dist/1562058643/assets/sheets/gameover.png
--- a/dist/1562058643/assets/sheets/gameover.sht
+++ b/dist/1562058643/assets/sheets/gameover.sht
+{
+	"file": "gameover.png",
+	"frames": {
+		"得分-拷贝.png": {
+			"x": 1,
+			"y": 1,
+			"w": 571,
+			"h": 672,
+			"offX": 0,
+			"offY": 0,
+			"sourceW": 571,
+			"sourceH": 752
+		},
+		"按钮2-拷贝.png": {
+			"x": 574,
+			"y": 1,
+			"w": 338,
+			"h": 110,
+			"offX": 0,
+			"offY": 0,
+			"sourceW": 338,
+			"sourceH": 110
+		},
+		"再来一次.png": {
+			"x": 574,
+			"y": 113,
+			"w": 259,
+			"h": 85,
+			"offX": 0,
+			"offY": 0,
+			"sourceW": 259,
+			"sourceH": 85
+		},
+		"Bitmap-4-1.png": {
+			"x": 835,
+			"y": 113,
+			"w": 48,
+			"h": 48,
+			"offX": 0,
+			"offY": 0,
+			"sourceW": 48,
+			"sourceH": 48
+		},
+		"得分.png": {
+			"x": 1,
+			"y": 675,
+			"w": 571,
+			"h": 652,
+			"offX": 0,
+			"offY": 0,
+			"sourceW": 571,
+			"sourceH": 652
+		}
+	}
+}
\ No newline at end of file
--- a/dist/1562058643/assets/sheets/play.png
+++ b/dist/1562058643/assets/sheets/play.png
--- a/dist/1562058643/assets/sheets/play.sht
+++ b/dist/1562058643/assets/sheets/play.sht
+{
+	"file": "play.png",
+	"frames": {
+		"淡蓝-1.png": {
+			"x": 1,
+			"y": 1,
+			"w": 223,
+			"h": 214,
+			"offX": 0,
+			"offY": 0,
+			"sourceW": 223,
+			"sourceH": 214
+		},
+		"绿-1.png": {
+			"x": 226,
+			"y": 1,
+			"w": 223,
+			"h": 213,
+			"offX": 0,
+			"offY": 0,
+			"sourceW": 223,
+			"sourceH": 213
+		},
+		"大炮板子-1.png": {
+			"x": 451,
+			"y": 1,
+			"w": 93,
+			"h": 23,
+			"offX": 0,
+			"offY": 0,
+			"sourceW": 93,
+			"sourceH": 23
+		},
+		"发弹雾气-1.png": {
+			"x": 451,
+			"y": 26,
+			"w": 87,
+			"h": 34,
+			"offX": 0,
+			"offY": 0,
+			"sourceW": 87,
+			"sourceH": 34
+		},
+		"子弹-1.png": {
+			"x": 540,
+			"y": 26,
+			"w": 10,
+			"h": 32,
+			"offX": 0,
+			"offY": 0,
+			"sourceW": 10,
+			"sourceH": 32
+		},
+		"大炮的头-1.png": {
+			"x": 451,
+			"y": 62,
+			"w": 70,
+			"h": 88,
+			"offX": 0,
+			"offY": 0,
+			"sourceW": 70,
+			"sourceH": 88
+		},
+		"淡蓝火箭-1.png": {
+			"x": 523,
+			"y": 62,
+			"w": 25,
+			"h": 27,
+			"offX": 0,
+			"offY": 0,
+			"sourceW": 25,
+			"sourceH": 27
+		},
+		"red20.png": {
+			"x": 523,
+			"y": 91,
+			"w": 25,
+			"h": 26,
+			"offX": 0,
+			"offY": 0,
+			"sourceW": 25,
+			"sourceH": 26
+		},
+		"1-1-1.png": {
+			"x": 451,
+			"y": 152,
+			"w": 45,
+			"h": 45,
+			"offX": 0,
+			"offY": 0,
+			"sourceW": 45,
+			"sourceH": 45
+		},
+		"紫-1.png": {
+			"x": 226,
+			"y": 216,
+			"w": 223,
+			"h": 213,
+			"offX": 0,
+			"offY": 0,
+			"sourceW": 223,
+			"sourceH": 213
+		},
+		"黄-1.png": {
+			"x": 1,
+			"y": 217,
+			"w": 222,
+			"h": 214,
+			"offX": 0,
+			"offY": 0,
+			"sourceW": 222,
+			"sourceH": 214
+		},
+		"蓝-1.png": {
+			"x": 225,
+			"y": 431,
+			"w": 222,
+			"h": 213,
+			"offX": 0,
+			"offY": 0,
+			"sourceW": 222,
+			"sourceH": 213
+		},
+		"红-1.png": {
+			"x": 1,
+			"y": 433,
+			"w": 222,
+			"h": 212,
+			"offX": 0,
+			"offY": 0,
+			"sourceW": 222,
+			"sourceH": 212
+		},
+		"火-1.png": {
+			"x": 225,
+			"y": 646,
+			"w": 128,
+			"h": 40,
+			"offX": 0,
+			"offY": 0,
+			"sourceW": 128,
+			"sourceH": 40
+		},
+		"火箭-1.png": {
+			"x": 355,
+			"y": 646,
+			"w": 128,
+			"h": 40,
+			"offX": 0,
+			"offY": 0,
+			"sourceW": 128,
+			"sourceH": 40
+		}
+	}
+}
\ No newline at end of file
--- a/dist/1562058643/assets/sheets/rule.png
+++ b/dist/1562058643/assets/sheets/rule.png
--- a/dist/1562058643/assets/sheets/rule.sht
+++ b/dist/1562058643/assets/sheets/rule.sht
+{
+	"file": "rule.png",
+	"frames": {
+		"游戏说明-1.png": {
+			"x": 1,
+			"y": 1,
+			"w": 571,
+			"h": 641,
+			"offX": 0,
+			"offY": 0,
+			"sourceW": 571,
+			"sourceH": 641
+		},
+		"closeBtn-1.png": {
+			"x": 1,
+			"y": 644,
+			"w": 56,
+			"h": 56,
+			"offX": 0,
+			"offY": 0,
+			"sourceW": 56,
+			"sourceH": 56
+		}
+	}
+}
\ No newline at end of file
--- a/dist/1562058643/assets/sheets/start.png
+++ b/dist/1562058643/assets/sheets/start.png
--- a/dist/1562058643/assets/sheets/start.sht
+++ b/dist/1562058643/assets/sheets/start.sht
--- a/dist/1562058643/assets/singles/alert/Bitmap-1.png
+++ b/dist/1562058643/assets/singles/alert/Bitmap-1.png
--- a/dist/1562058643/assets/singles/alert/Bitmap-2.png
+++ b/dist/1562058643/assets/singles/alert/Bitmap-2.png
--- a/dist/1562058643/assets/singles/alert/Bitmap-4.png
+++ b/dist/1562058643/assets/singles/alert/Bitmap-4.png
--- a/dist/1562058643/assets/singles/alert/alert_bg_lose.png
+++ b/dist/1562058643/assets/singles/alert/alert_bg_lose.png
--- a/dist/1562058643/assets/singles/alert/sure_btn.png
+++ b/dist/1562058643/assets/singles/alert/sure_btn.png
--- a/dist/1562058643/assets/singles/close.png
+++ b/dist/1562058643/assets/singles/close.png
--- a/dist/1562058643/assets/singles/dialog-bg.png
+++ b/dist/1562058643/assets/singles/dialog-bg.png
--- a/dist/1562058643/assets/singles/gameover_panel/closeBtn_gover.png
+++ b/dist/1562058643/assets/singles/gameover_panel/closeBtn_gover.png
--- a/dist/1562058643/assets/singles/gameover_panel/gameoverBg.png
+++ b/dist/1562058643/assets/singles/gameover_panel/gameoverBg.png
--- a/dist/1562058643/assets/singles/gameover_panel/okBtn.png
+++ b/dist/1562058643/assets/singles/gameover_panel/okBtn.png
--- a/dist/1562058643/assets/singles/loading/bg.png
+++ b/dist/1562058643/assets/singles/loading/bg.png
--- a/dist/1562058643/assets/singles/loading/progress.png
+++ b/dist/1562058643/assets/singles/loading/progress.png
--- a/dist/1562058643/assets/singles/logo.png
+++ b/dist/1562058643/assets/singles/logo.png
--- a/dist/1562058643/assets/singles/msg_panel/closeBtn_msg.png
+++ b/dist/1562058643/assets/singles/msg_panel/closeBtn_msg.png
--- a/dist/1562058643/assets/singles/msg_panel/msgBg.png
+++ b/dist/1562058643/assets/singles/msg_panel/msgBg.png
--- a/dist/1562058643/assets/singles/msg_panel/okBtnMsg.png
+++ b/dist/1562058643/assets/singles/msg_panel/okBtnMsg.png
--- a/dist/1562058643/assets/singles/msg_panel/starIcon.png
+++ b/dist/1562058643/assets/singles/msg_panel/starIcon.png
--- a/dist/1562058643/assets/singles/msg_panel/titleBg.png
+++ b/dist/1562058643/assets/singles/msg_panel/titleBg.png
--- a/dist/1562058643/assets/singles/prize_panel/closeBtn.png
+++ b/dist/1562058643/assets/singles/prize_panel/closeBtn.png
--- a/dist/1562058643/assets/singles/prize_panel/getPrizeBtn.png
+++ b/dist/1562058643/assets/singles/prize_panel/getPrizeBtn.png
--- a/dist/1562058643/assets/singles/prize_panel/prizeBg.png
+++ b/dist/1562058643/assets/singles/prize_panel/prizeBg.png
--- a/dist/1562058643/assets/singles/prize_panel/prizeimg.png
+++ b/dist/1562058643/assets/singles/prize_panel/prizeimg.png
--- a/dist/1562058643/assets/singles/rule_panel/closeBtn_rule.png
+++ b/dist/1562058643/assets/singles/rule_panel/closeBtn_rule.png
--- a/dist/1562058643/assets/singles/rule_panel/ruleBg.png
+++ b/dist/1562058643/assets/singles/rule_panel/ruleBg.png
--- a/dist/1562058643/assets/singles/start_scene/backBtn.png
+++ b/dist/1562058643/assets/singles/start_scene/backBtn.png
--- a/dist/1562058643/assets/singles/start_scene/jiazi.png
+++ b/dist/1562058643/assets/singles/start_scene/jiazi.png
--- a/dist/1562058643/assets/singles/start_scene/jiu.png
+++ b/dist/1562058643/assets/singles/start_scene/jiu.png
--- a/dist/1562058643/assets/singles/start_scene/jiu_bg.png
+++ b/dist/1562058643/assets/singles/start_scene/jiu_bg.png
--- a/dist/1562058643/assets/singles/start_scene/logo.png
+++ b/dist/1562058643/assets/singles/start_scene/logo.png
--- a/dist/1562058643/assets/singles/start_scene/music_off.png
+++ b/dist/1562058643/assets/singles/start_scene/music_off.png
--- a/dist/1562058643/assets/singles/start_scene/music_on.png
+++ b/dist/1562058643/assets/singles/start_scene/music_on.png
--- a/dist/1562058643/assets/singles/start_scene/myPrizeBtn.png
+++ b/dist/1562058643/assets/singles/start_scene/myPrizeBtn.png
--- a/dist/1562058643/assets/singles/start_scene/passIcon.png
+++ b/dist/1562058643/assets/singles/start_scene/passIcon.png
--- a/dist/1562058643/assets/singles/start_scene/people_ico.png
+++ b/dist/1562058643/assets/singles/start_scene/people_ico.png
--- a/dist/1562058643/assets/singles/start_scene/ruleBtn.png
+++ b/dist/1562058643/assets/singles/start_scene/ruleBtn.png
--- a/dist/1562058643/assets/singles/start_scene/startBg.jpg
+++ b/dist/1562058643/assets/singles/start_scene/startBg.jpg
--- a/dist/1562058643/assets/singles/start_scene/startBtn.png
+++ b/dist/1562058643/assets/singles/start_scene/startBtn.png
--- a/dist/1562058643/assets/singles/start_scene/startBtn_disable.png
+++ b/dist/1562058643/assets/singles/start_scene/startBtn_disable.png
--- a/dist/1562058643/assets/singles/start_scene/startWinBg.png
+++ b/dist/1562058643/assets/singles/start_scene/startWinBg.png
--- a/dist/1562058643/assets/singles/start_scene/starttips.png
+++ b/dist/1562058643/assets/singles/start_scene/starttips.png
--- a/dist/1562058643/assets/singles/waiting/bg.png
+++ b/dist/1562058643/assets/singles/waiting/bg.png
--- a/dist/1562058643/assets/singles/waiting/progress.png
+++ b/dist/1562058643/assets/singles/waiting/progress.png
--- a/dist/1562058643/assets/singles/warning_panel/closeBtn_warn.png
+++ b/dist/1562058643/assets/singles/warning_panel/closeBtn_warn.png
--- a/dist/1562058643/assets/singles/warning_panel/guidOkBtn.png
+++ b/dist/1562058643/assets/singles/warning_panel/guidOkBtn.png
--- a/dist/1562058643/assets/singles/warning_panel/okBtn_warn.png
+++ b/dist/1562058643/assets/singles/warning_panel/okBtn_warn.png
--- a/dist/1562058643/assets/singles/warning_panel/warnBg.png
+++ b/dist/1562058643/assets/singles/warning_panel/warnBg.png
--- a/dist/1562058643/bundle.js
+++ b/dist/1562058643/bundle.js
--- a/dist/1562058643/index.html
+++ b/dist/1562058643/index.html
--- a/dist/1562058643/manifest.json
+++ b/dist/1562058643/manifest.json
--- a/index.1.html
+++ b/index.1.html