Merge remote-tracking branch 'origin/dev' into dev

# Conflicts: # dist/customs/jump-high.json # src/custom/jump-high/debug/main.js.map

Merge remote-tracking branch 'origin/dev' into dev
# Conflicts: # dist/customs/jump-high.json # src/custom/jump-high/debug/main.js.map
dbe171a4 · rockyl · d914feca · a4973078 · dbe171a4 · dbe171a4
Commit dbe171a4 authored Apr 07, 2020 by rockyl
108 changed files
--- a/.history/src/custom/jump-high-2/debug/app_20200402114103.js
+++ b/.history/src/custom/jump-high-2/debug/app_20200402114103.js
+/**
+ * Created by rockyl on 2019-12-16.
+ */
+
+const customId = 'jump-high';
+
+(async function () {
+	let customModule = await fetch(`../meta.json`);
+	customModule = await customModule.json();
+	console.log(customModule);
+
+	await loadAssets(customModule.assets);
+	launchWithCustomModule(customModule);
+})();
+
+function launchWithCustomModule(customModule) {
+	engine.globalEvent.addEventListener('update-game-status', (e) => {
+		console.log(e.type, e.data);
+	});
+
+	//engine.registerCustomCodeModule(customModule);
+	engine.registerCustomModule(customId, window[customId]);
+
+	const {props: propsOption, assets} = customModule;
+	let props = engine.computeProps(customModuleProps, propsOption);
+	const customModuleIns = {
+		id: customId,
+		props,
+		assets,
+	};
+
+	engine.registerCustomModules([customModuleIns]);
+	engine.launchWithConfig({
+		options: {
+			entrySceneView: 'entry',
+		},
+		assets: [],
+		views: [{
+			name: 'entry',
+			type: 'node',
+		}],
+	}, null, function () {
+		setTimeout(() => {
+			engine.addCustomModule(customId, engine.gameStage.sceneContainer.getChildAt(0));
+		}, 100);
+
+		setTimeout(() => {
+			engine.globalEvent.dispatchEvent('jump-high-start', {level: 1});
+		}, 500);
+	});
+}
+
+function getAssetByUUID(uuid) {
+	return engine.resolveCustomAsset(customId, uuid);
+}
+
+function getProps() {
+	return engine.getProps(customId);
+}
--- a/.history/src/custom/jump-high-2/debug/app_20200402114317.js
+++ b/.history/src/custom/jump-high-2/debug/app_20200402114317.js
+/**
+ * Created by rockyl on 2019-12-16.
+ */
+
+const customId = 'jump-high-2';
+
+(async function () {
+	let customModule = await fetch(`../meta.json`);
+	customModule = await customModule.json();
+	console.log(customModule);
+
+	await loadAssets(customModule.assets);
+	launchWithCustomModule(customModule);
+})();
+
+function launchWithCustomModule(customModule) {
+	engine.globalEvent.addEventListener('update-game-status', (e) => {
+		console.log(e.type, e.data);
+	});
+
+	//engine.registerCustomCodeModule(customModule);
+	engine.registerCustomModule(customId, window[customId]);
+
+	const {props: propsOption, assets} = customModule;
+	let props = engine.computeProps(customModuleProps, propsOption);
+	const customModuleIns = {
+		id: customId,
+		props,
+		assets,
+	};
+
+	engine.registerCustomModules([customModuleIns]);
+	engine.launchWithConfig({
+		options: {
+			entrySceneView: 'entry',
+		},
+		assets: [],
+		views: [{
+			name: 'entry',
+			type: 'node',
+		}],
+	}, null, function () {
+		setTimeout(() => {
+			engine.addCustomModule(customId, engine.gameStage.sceneContainer.getChildAt(0));
+		}, 100);
+
+		setTimeout(() => {
+			engine.globalEvent.dispatchEvent('jump-high-start', {level: 1});
+		}, 500);
+	});
+}
+
+function getAssetByUUID(uuid) {
+	return engine.resolveCustomAsset(customId, uuid);
+}
+
+function getProps() {
+	return engine.getProps(customId);
+}
--- a/.history/src/custom/jump-high-2/debug/index_20200402114103.html
+++ b/.history/src/custom/jump-high-2/debug/index_20200402114103.html
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+	<meta charset="UTF-8">
+	<title>叠叠高</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"/>
+	<style>
+		html,
+		body {
+			padding: 0;
+			margin: 0;
+			border: 0;
+
+			width: 100%;
+			height: 100%;
+			overflow: hidden;
+			position: absolute;
+			background-color: transparent;
+		}
+	</style>
+</head>
+
+<body>
+<div id="game-container" style="line-height:0;font-size:0"></div>
+<script src="http://localhost:4002/debug/engine.js"></script>
+<script src="http://localhost:4003/debug/engine-svga.js"></script>
+<!--<script src="//yun.duiba.com.cn/editor/zeroing/libs/engine.9a9dbfda4cb2dd5508ecddfe3d95dfd88063f7b5.js"></script>-->
+<script src="app.js"></script>
+<script src="props.js"></script>
+<script src="load-assets.js"></script>
+<script src="main.js"></script>
+<script>
+
+</script>
+</body>
\ No newline at end of file
--- a/.history/src/custom/jump-high-2/debug/index_20200402114317.html
+++ b/.history/src/custom/jump-high-2/debug/index_20200402114317.html
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+	<meta charset="UTF-8">
+	<title>叠叠高</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"/>
+	<style>
+		html,
+		body {
+			padding: 0;
+			margin: 0;
+			border: 0;
+
+			width: 100%;
+			height: 100%;
+			overflow: hidden;
+			position: absolute;
+			background-color: transparent;
+		}
+	</style>
+</head>
+
+<body>
+<div id="game-container" style="line-height:0;font-size:0"></div>
+<script crossorigin="anonymous" src="//yun.duiba.com.cn/editor/zeroing/libs/engine.50cdcef6ebe4e8c0fbc624f9d4fbf225102c5750.js"></script>
+<script crossorigin="anonymous" src="//yun.duiba.com.cn/editor/zeroing/libs/svga.fd3923ae6e664251ca7981801a65809cc5f36bc3.js"></script>
+<!--<script src="//yun.duiba.com.cn/editor/zeroing/libs/engine.9a9dbfda4cb2dd5508ecddfe3d95dfd88063f7b5.js"></script>-->
+<script src="app.js"></script>
+<script src="props.js"></script>
+<script src="load-assets.js"></script>
+<script src="main.js"></script>
+<script>
+
+</script>
+</body>
\ No newline at end of file
--- a/.history/src/custom/jump-high-2/debug/load-assets_20200402114103.js
+++ b/.history/src/custom/jump-high-2/debug/load-assets_20200402114103.js
+/**
+ * Created by rockyl on 2020-01-21.
+ */
+ 
+const assets = [
+	{
+		"name": "方块素材0",
+		"url": "//yun.duiba.com.cn/aurora/assets/0307ca8906e9f553e6873c346ae5c6ec3655db59.svga",
+		"uuid": "4e31f5d7-bd03-41a3-873c-3755fe4862e6",
+		"ext": '.svga'
+	}
+];
+
+function loadAssets(customModuleAssets, onProgress, onComplete){
+	return engine.loadAssets(assets.concat(...customModuleAssets), onProgress, onComplete);
+}
--- a/.history/src/custom/jump-high-2/debug/load-assets_20200402142046.js
+++ b/.history/src/custom/jump-high-2/debug/load-assets_20200402142046.js
+/**
+ * Created by rockyl on 2020-01-21.
+ */
+ 
+const assets = [
+	// {
+	// 	"name": "方块素材0",
+	// 	"url": "//yun.duiba.com.cn/aurora/assets/0307ca8906e9f553e6873c346ae5c6ec3655db59.svga",
+	// 	"uuid": "4e31f5d7-bd03-41a3-873c-3755fe4862e6",
+	// 	"ext": '.svga'
+	// }
+];
+
+function loadAssets(customModuleAssets, onProgress, onComplete){
+	return engine.loadAssets(assets.concat(...customModuleAssets), onProgress, onComplete);
+}
--- a/.history/src/custom/jump-high-2/meta_20200402114103.json
+++ b/.history/src/custom/jump-high-2/meta_20200402114103.json
--- a/.history/src/custom/jump-high-2/meta_20200402120100.json
+++ b/.history/src/custom/jump-high-2/meta_20200402120100.json
--- a/.history/src/custom/jump-high-2/meta_20200402141903.json
+++ b/.history/src/custom/jump-high-2/meta_20200402141903.json
--- a/.history/src/custom/jump-high-2/meta_20200402142139.json
+++ b/.history/src/custom/jump-high-2/meta_20200402142139.json
--- a/.history/src/custom/jump-high-2/meta_20200402142304.json
+++ b/.history/src/custom/jump-high-2/meta_20200402142304.json
--- a/.history/src/custom/jump-high-2/meta_20200402142315.json
+++ b/.history/src/custom/jump-high-2/meta_20200402142315.json
--- a/.history/src/custom/jump-high-2/meta_20200402142334.json
+++ b/.history/src/custom/jump-high-2/meta_20200402142334.json
--- a/.history/src/custom/jump-high-2/meta_20200402142347.json
+++ b/.history/src/custom/jump-high-2/meta_20200402142347.json
--- a/.history/src/custom/jump-high-2/meta_20200402161005.json
+++ b/.history/src/custom/jump-high-2/meta_20200402161005.json
--- a/.history/src/custom/jump-high-2/meta_20200402161022.json
+++ b/.history/src/custom/jump-high-2/meta_20200402161022.json
--- a/.history/src/custom/jump-high-2/meta_20200402161032.json
+++ b/.history/src/custom/jump-high-2/meta_20200402161032.json
--- a/.history/src/custom/jump-high-2/meta_20200402161041.json
+++ b/.history/src/custom/jump-high-2/meta_20200402161041.json
--- a/.history/src/custom/jump-high-2/meta_20200402161054.json
+++ b/.history/src/custom/jump-high-2/meta_20200402161054.json
--- a/.history/src/custom/jump-high-2/meta_20200402161112.json
+++ b/.history/src/custom/jump-high-2/meta_20200402161112.json
--- a/.history/src/custom/jump-high-2/meta_20200402162727.json
+++ b/.history/src/custom/jump-high-2/meta_20200402162727.json
--- a/.history/src/custom/jump-high-2/meta_20200402162741.json
+++ b/.history/src/custom/jump-high-2/meta_20200402162741.json
--- a/.history/src/custom/jump-high-2/meta_20200402162804.json
+++ b/.history/src/custom/jump-high-2/meta_20200402162804.json
--- a/.history/src/custom/jump-high-2/meta_20200402162930.json
+++ b/.history/src/custom/jump-high-2/meta_20200402162930.json
--- a/.history/src/custom/jump-high-2/meta_20200402162945.json
+++ b/.history/src/custom/jump-high-2/meta_20200402162945.json
--- a/.history/src/custom/jump-high-2/meta_20200402162954.json
+++ b/.history/src/custom/jump-high-2/meta_20200402162954.json
--- a/.history/src/custom/jump-high-2/meta_20200403135713.json
+++ b/.history/src/custom/jump-high-2/meta_20200403135713.json
--- a/.history/src/custom/jump-high-2/meta_20200403141440.json
+++ b/.history/src/custom/jump-high-2/meta_20200403141440.json
--- a/.history/src/custom/jump-high-2/meta_20200403141515.json
+++ b/.history/src/custom/jump-high-2/meta_20200403141515.json
--- a/.history/src/custom/jump-high-2/meta_20200403141624.json
+++ b/.history/src/custom/jump-high-2/meta_20200403141624.json
--- a/.history/src/custom/jump-high-2/meta_20200403162546.json
+++ b/.history/src/custom/jump-high-2/meta_20200403162546.json
--- a/.history/src/custom/jump-high-2/meta_20200403162845.json
+++ b/.history/src/custom/jump-high-2/meta_20200403162845.json
--- a/.history/src/custom/jump-high-2/meta_20200403162855.json
+++ b/.history/src/custom/jump-high-2/meta_20200403162855.json
--- a/.history/src/custom/jump-high-2/meta_20200403162905.json
+++ b/.history/src/custom/jump-high-2/meta_20200403162905.json
--- a/.history/src/custom/jump-high-2/meta_20200403163133.json
+++ b/.history/src/custom/jump-high-2/meta_20200403163133.json
--- a/.history/src/custom/jump-high-2/meta_20200403163142.json
+++ b/.history/src/custom/jump-high-2/meta_20200403163142.json
--- a/.history/src/custom/jump-high-2/meta_20200403170437.json
+++ b/.history/src/custom/jump-high-2/meta_20200403170437.json
--- a/.history/src/custom/jump-high-2/meta_20200403171548.json
+++ b/.history/src/custom/jump-high-2/meta_20200403171548.json
--- a/.history/src/custom/jump-high-2/meta_20200403171630.json
+++ b/.history/src/custom/jump-high-2/meta_20200403171630.json
--- a/.history/src/custom/jump-high-2/meta_20200403171654.json
+++ b/.history/src/custom/jump-high-2/meta_20200403171654.json
--- a/.history/src/custom/jump-high-2/meta_20200403171710.json
+++ b/.history/src/custom/jump-high-2/meta_20200403171710.json
--- a/.history/src/custom/jump-high-2/meta_20200403171802.json
+++ b/.history/src/custom/jump-high-2/meta_20200403171802.json
--- a/.history/src/custom/jump-high-2/meta_20200403171834.json
+++ b/.history/src/custom/jump-high-2/meta_20200403171834.json
--- a/.history/src/custom/jump-high-2/meta_20200403171845.json
+++ b/.history/src/custom/jump-high-2/meta_20200403171845.json
--- a/.history/src/custom/jump-high-2/meta_20200403171902.json
+++ b/.history/src/custom/jump-high-2/meta_20200403171902.json
--- a/.history/src/custom/jump-high-2/meta_20200403172005.json
+++ b/.history/src/custom/jump-high-2/meta_20200403172005.json
--- a/.history/src/custom/jump-high-2/meta_20200403175053.json
+++ b/.history/src/custom/jump-high-2/meta_20200403175053.json
--- a/.history/src/custom/jump-high-2/meta_20200403175529.json
+++ b/.history/src/custom/jump-high-2/meta_20200403175529.json
--- a/.history/src/custom/jump-high-2/src/game/GameView_20200402114103.ts
+++ b/.history/src/custom/jump-high-2/src/game/GameView_20200402114103.ts
--- a/.history/src/custom/jump-high-2/src/game/GameView_20200403163305.ts
+++ b/.history/src/custom/jump-high-2/src/game/GameView_20200403163305.ts
--- a/.history/src/custom/jump-high-2/src/game/GameView_20200403163316.ts
+++ b/.history/src/custom/jump-high-2/src/game/GameView_20200403163316.ts
--- a/.history/src/custom/jump-high-2/src/game/GameView_20200403163332.ts
+++ b/.history/src/custom/jump-high-2/src/game/GameView_20200403163332.ts
--- a/.history/src/custom/jump-high-2/src/game/GameView_20200403163341.ts
+++ b/.history/src/custom/jump-high-2/src/game/GameView_20200403163341.ts
--- a/.history/src/custom/jump-high-2/src/game/GameView_20200403170820.ts
+++ b/.history/src/custom/jump-high-2/src/game/GameView_20200403170820.ts
--- a/.history/src/custom/jump-high-2/src/game/Player_20200402114103.ts
+++ b/.history/src/custom/jump-high-2/src/game/Player_20200402114103.ts
+/**
+ * Created by rockyl on 2018/8/17.
+ */
+
+import {props} from "../props";
+import {createSvga, playSound} from "./utils";
+
+const svgaAssets = {
+	aniReady: {name: '准备立正', dir: 1},
+	aniJump: {name: '跳上升', dir: 1},
+	aniFall: {name: '跳下落', dir: 1},
+	aniLandNormal: {name: '普通着地', dir: 1},
+	aniLandSide: {name: '边缘着地', dir: -1},
+	aniHit: {name: '被撞开', dir: -1},
+	aniParachute: {name: '降落', dir: -1},
+};
+
+export default class Player extends engine.Container {
+	private jumpPromise;
+	private playing;
+	private vy;
+	private g = props.gravity;
+	private baseY;
+
+	private aboveBlock;
+
+	private _aniName;
+
+	private _currentAni: svga.Svga;
+	private _prefectLandCounting;
+
+	private aniJump: svga.Svga;
+	private aniFall: svga.Svga;
+	private aniLandNormal: svga.Svga;
+	private aniLandSide: svga.Svga;
+	private aniHit: svga.Svga;
+	private aniParachute: svga.Svga;
+
+	private prefectEffect: svga.Svga;
+	private landEffect: svga.Svga;
+
+	constructor() {
+		super();
+
+		this.addEventListener(engine.Event.ENTER_FRAME, this.onEnterFrame, this);
+	}
+
+	switchAni(name, dir = 1, play = true, loop = false) {
+		return new Promise(resolve => {
+			this.scaleX = dir;
+			if (this._aniName !== name) {
+				this._aniName = name;
+				let oldAni = <svga.Svga>this.removeChild(this.getChildByName('body'));
+				if (oldAni) {
+					oldAni.stop();
+				}
+				let ani: svga.Svga = this._currentAni = this['ani' + name];
+				this.addChild(ani);
+
+				if (play) {
+					ani.play(false, loop);
+					if (loop) {
+						resolve();
+					} else {
+						ani.once(engine.Event.END_FRAME, resolve);
+					}
+				} else {
+					ani.gotoAndStop(1);
+					resolve();
+				}
+			}
+		})
+	}
+
+	setup() {
+		this.prefectEffect = createSvga('完美着地特效', 'playerLandPrefectAnchor');
+		this.landEffect = createSvga('着地特效', 'playerLandEffectAnchor');
+
+		for (let key in svgaAssets) {
+			let {name, dir} = svgaAssets[key];
+			let body = this[key] = createSvga(name, key.replace('ani', 'player') + 'Anchor');
+
+			body.name = 'body';
+			body.scaleX = dir;
+		}
+	}
+
+	reset(revive) {
+		this.x = 0;
+		this.rotation = 0;
+		this.scaleX = this.scaleY = 1;
+		this._prefectLandCounting = 0;
+
+		engine.Tween.removeTweens(this);
+		if(revive){
+			this.switchAni('Jump', 1, false);
+		}
+	}
+
+	playReady() {
+		return new Promise(resolve => {
+			this.switchAni('Ready', 1);
+			this._currentAni.once(engine.Event.END_FRAME, function () {
+				this.switchAni('Jump', 1, false);
+				resolve();
+			}, this);
+		})
+	}
+
+	private onEnterFrame(event) {
+		if (!this.playing) {
+			return;
+		}
+
+		this.vy += this.g;
+		this.y += this.vy;
+
+		if (this.vy > 0 && this._aniName !== 'Fall') {
+			this.dispatchEvent('jump-on-top');
+			this.switchAni('Fall');
+		}
+
+		if (this.y > this.baseY) {
+			this.y = this.baseY;
+
+			this.playing = false;
+			//this.aniDown.play(0);
+
+			this.jumpPromise && this.jumpPromise({
+				aboveBlock: this.aboveBlock,
+			});
+			this.jumpPromise = null;
+		}
+	}
+
+	changeBaseY(v) {
+		if (this.baseY == v) {
+			return;
+		}
+
+		this.aboveBlock = true;
+		this.baseY = v;
+	}
+
+	jump() {
+		playSound('跳起音效');
+		this.switchAni('Jump', 1, false);
+		this._currentAni.play(false, false);
+
+		this.aboveBlock = false;
+		this.playing = true;
+
+		this.baseY = this.y;
+		this.vy = -props.jumpSpeed;
+
+		return new Promise(resolve => {
+			this.jumpPromise = resolve;
+		})
+	}
+
+	async playLand(type, dir) {
+		switch (type) {
+			case 0:
+				this._prefectLandCounting++;
+				playSound('完美落地音效' + Math.min(4, this._prefectLandCounting));
+
+				let prefectEffect = this.prefectEffect;
+				this.addChildAt(prefectEffect, 0);
+				prefectEffect.gotoAndPlay(1);
+				prefectEffect.once(engine.Event.END_FRAME, function () {
+					this.removeChild(prefectEffect);
+				}, this);
+
+				let landEffect = this.landEffect;
+				this.addChildAt(landEffect, 0);
+				landEffect.gotoAndPlay(1);
+				landEffect.once(engine.Event.END_FRAME, function () {
+					this.removeChild(landEffect);
+				}, this);
+
+				await this.switchAni('LandNormal');
+				break;
+			case 1:
+			case 2:
+				this._prefectLandCounting = 0;
+				playSound('普通落地音效');
+				this.switchAni('LandNormal');
+				break;
+			case 3:
+				this._prefectLandCounting = 0;
+				playSound('边缘落地音效');
+				this.switchAni('LandSide', dir);
+				break;
+		}
+	}
+
+	async hitAway(dir) {
+		this.jumpPromise && this.jumpPromise();
+		this.jumpPromise = null;
+
+		playSound('被撞开音效');
+		this.switchAni('Hit', dir);
+
+		this.vy = 0;
+		await new Promise(resolve => {
+			engine.Tween.get(this)
+				.to({
+					x: -dir * props.hitAwayDistance.x,
+				}, props.hitAwayDuration, engine.Ease.quartOut);
+			engine.Tween.get(this)
+				.to({
+					y: this.y + props.hitAwayDistance.y,
+				}, props.hitAwayDuration, engine.Ease.cubicOut)
+				.call(resolve)
+		});
+	}
+
+	parachute(dir) {
+		this.switchAni('Parachute', dir);
+
+		return new Promise(resolve => {
+			engine.Tween.get(this)
+				.wait(200)
+				.call(function () {
+					playSound('降落伞下落音效');
+				})
+				.wait(300)
+				.to({y: this.y + props.parachuteDistance}, props.parachuteDuration)
+				.set({anchorOffsetY: 0})
+				.call(resolve)
+		});
+	}
+}
--- a/.history/src/custom/jump-high-2/src/game/Player_20200403163217.ts
+++ b/.history/src/custom/jump-high-2/src/game/Player_20200403163217.ts
--- a/.history/src/custom/jump-high-2/src/game/Player_20200403163228.ts
+++ b/.history/src/custom/jump-high-2/src/game/Player_20200403163228.ts
--- a/.history/src/custom/jump-high-2/src/game/Player_20200403163423.ts
+++ b/.history/src/custom/jump-high-2/src/game/Player_20200403163423.ts
--- a/.history/src/custom/jump-high-2/src/game/Player_20200403163442.ts
+++ b/.history/src/custom/jump-high-2/src/game/Player_20200403163442.ts
--- a/.history/src/custom/jump-high-2/src/game/Player_20200403170948.ts
+++ b/.history/src/custom/jump-high-2/src/game/Player_20200403170948.ts
--- a/.history/src/custom/jump-high-2/src/game/Player_20200403171125.ts
+++ b/.history/src/custom/jump-high-2/src/game/Player_20200403171125.ts
--- a/.history/src/custom/jump-high-2/src/game/Player_20200403171240.ts
+++ b/.history/src/custom/jump-high-2/src/game/Player_20200403171240.ts
--- a/.history/src/custom/jump-high-2/src/game/Player_20200403175200.ts
+++ b/.history/src/custom/jump-high-2/src/game/Player_20200403175200.ts
--- a/.history/src/custom/jump-high-2/src/game/Player_20200403175337.ts
+++ b/.history/src/custom/jump-high-2/src/game/Player_20200403175337.ts
--- a/.history/src/custom/jump-high-2/src/game/Player_20200403175714.ts
+++ b/.history/src/custom/jump-high-2/src/game/Player_20200403175714.ts
--- a/.history/src/custom/jump-high-2/src/game/Player_20200403175933.ts
+++ b/.history/src/custom/jump-high-2/src/game/Player_20200403175933.ts
--- a/.history/src/custom/jump-high/debug/index_20200311120512.html
+++ b/.history/src/custom/jump-high/debug/index_20200311120512.html
--- a/.history/src/custom/jump-high/debug/index_20200403171404.html
+++ b/.history/src/custom/jump-high/debug/index_20200403171404.html
--- a/.history/src/custom/jump-high/debug/index_20200403171430.html
+++ b/.history/src/custom/jump-high/debug/index_20200403171430.html
--- a/dist/customs/food-fell.json
+++ b/dist/customs/food-fell.json
--- a/dist/customs/jump-high-2.json
+++ b/dist/customs/jump-high-2.json
--- a/dist/customs/jump-high.json
+++ b/dist/customs/jump-high.json
--- a/dist/customs/pick-tea.json
+++ b/dist/customs/pick-tea.json
--- a/src/custom/food-fell/debug/main.js
+++ b/src/custom/food-fell/debug/main.js
--- a/src/custom/food-fell/debug/main.js.map
+++ b/src/custom/food-fell/debug/main.js.map
--- a/src/custom/jump-high-2/debug/app.js
+++ b/src/custom/jump-high-2/debug/app.js
--- a/src/custom/jump-high-2/debug/index.html
+++ b/src/custom/jump-high-2/debug/index.html
--- a/src/custom/jump-high-2/debug/load-assets.js
+++ b/src/custom/jump-high-2/debug/load-assets.js
--- a/src/custom/jump-high-2/debug/main.js
+++ b/src/custom/jump-high-2/debug/main.js
--- a/src/custom/jump-high-2/debug/main.js.map
+++ b/src/custom/jump-high-2/debug/main.js.map
--- a/src/custom/jump-high-2/debug/props.js
+++ b/src/custom/jump-high-2/debug/props.js
--- a/src/custom/jump-high-2/meta.json
+++ b/src/custom/jump-high-2/meta.json
--- a/src/custom/jump-high-2/src/game/Background.ts
+++ b/src/custom/jump-high-2/src/game/Background.ts
--- a/src/custom/jump-high-2/src/game/Base.ts
+++ b/src/custom/jump-high-2/src/game/Base.ts
--- a/src/custom/jump-high-2/src/game/Block.ts
+++ b/src/custom/jump-high-2/src/game/Block.ts
--- a/src/custom/jump-high-2/src/game/GameView.ts
+++ b/src/custom/jump-high-2/src/game/GameView.ts
--- a/src/custom/jump-high-2/src/game/GoldBag.ts
+++ b/src/custom/jump-high-2/src/game/GoldBag.ts
--- a/src/custom/jump-high-2/src/game/GuideLayer.ts
+++ b/src/custom/jump-high-2/src/game/GuideLayer.ts
--- a/src/custom/jump-high-2/src/game/JumpHigh.ts
+++ b/src/custom/jump-high-2/src/game/JumpHigh.ts
--- a/src/custom/jump-high-2/src/game/Player.ts
+++ b/src/custom/jump-high-2/src/game/Player.ts
--- a/src/custom/jump-high-2/src/game/utils.ts
+++ b/src/custom/jump-high-2/src/game/utils.ts
--- a/src/custom/jump-high-2/src/index.ts
+++ b/src/custom/jump-high-2/src/index.ts
--- a/src/custom/jump-high-2/src/props.ts
+++ b/src/custom/jump-high-2/src/props.ts
--- a/src/custom/jump-high/debug/main.js
+++ b/src/custom/jump-high/debug/main.js
--- a/src/custom/jump-high/debug/main.js.map
+++ b/src/custom/jump-high/debug/main.js.map
--- a/src/custom/pick-tea/debug/app.js
+++ b/src/custom/pick-tea/debug/app.js
--- a/src/custom/pick-tea/debug/index.html
+++ b/src/custom/pick-tea/debug/index.html
--- a/src/custom/pick-tea/debug/load-assets.js
+++ b/src/custom/pick-tea/debug/load-assets.js
--- a/src/custom/pick-tea/debug/main.js
+++ b/src/custom/pick-tea/debug/main.js
--- a/src/custom/pick-tea/debug/main.js.map
+++ b/src/custom/pick-tea/debug/main.js.map
--- a/src/custom/pick-tea/debug/props.js
+++ b/src/custom/pick-tea/debug/props.js
--- a/src/custom/pick-tea/meta.json
+++ b/src/custom/pick-tea/meta.json
--- a/src/custom/pick-tea/src/game/GameView.ts
+++ b/src/custom/pick-tea/src/game/GameView.ts
--- a/src/custom/pick-tea/src/game/GameWrapper.ts
+++ b/src/custom/pick-tea/src/game/GameWrapper.ts
--- a/src/custom/pick-tea/src/game/Tealeaf.ts
+++ b/src/custom/pick-tea/src/game/Tealeaf.ts
--- a/src/custom/pick-tea/src/game/utils.ts
+++ b/src/custom/pick-tea/src/game/utils.ts
--- a/src/custom/pick-tea/src/index.ts
+++ b/src/custom/pick-tea/src/index.ts
--- a/src/custom/pick-tea/src/props.ts
+++ b/src/custom/pick-tea/src/props.ts