diff --git a/assets/img/tutorial2d.png b/assets/img/tutorial2d.png index 19b42ba..c7d7bc9 100755 Binary files a/assets/img/tutorial2d.png and b/assets/img/tutorial2d.png differ diff --git a/src/assets.html b/src/assets.html index 094d60e..0d7c45f 100644 --- a/src/assets.html +++ b/src/assets.html @@ -76,7 +76,7 @@ - + @@ -181,6 +181,9 @@ animation__skycoloroff="isRawProperty: true; property: systems.materials.stageNormal.uniforms.skyColor.value; type: color; to: {{ COLORS.SKY_OFF }}; dur: 500; easing: linear; startEvents: bgcoloroff" animation__skycolorblue="isRawProperty: true; property: systems.materials.stageNormal.uniforms.skyColor.value; type: color; to: {{ COLORS.SKY_BLUE }}; dur: 5; easing: linear; startEvents: bgcolorblue" animation__skycolorred="isRawProperty: true; property: systems.materials.stageNormal.uniforms.skyColor.value; type: color; to: {{ COLORS.SKY_RED }}; dur: 5; easing: linear; startEvents: bgcolorred" + + animation__bgcolorgameover="isRawProperty: true; property: systems.materials.stageNormal.uniforms.backglowColor.value; type: color; to: {{ COLORS.BG_OFF }}; dur: 500; easing: linear; startEvents: bgcolorgameover" + animation__skycolorgameover="isRawProperty: true; property: systems.materials.stageNormal.uniforms.skyColor.value; type: color; to: {{ COLORS.SKY_BLUE }}; dur: 5; easing: linear; startEvents: bgcolorgameover" > { - this.preloadBeamMap(); + this.preloadAtlas(); + this.preloadLogo(); + //this.prelodBeamMap(); this.preloadBeatEnvMap(); this.preloadCutParticles(); this.preloadKeyboard(); - this.preloadMissMap(); + //this.preloadMissMap(); this.preloadPlayButton(); this.preloadSearchPrevPage(); //this.preloadWallMap(); - this.preloadWrongMap(); + //this.preloadWrongMap(); this.preloadGenres(); }, 1000); }, + preloadAtlas: function () { + const stage = document.querySelector('#stageObj'); + this.preloadTexture(stage.getObject3D('mesh').children[0].material.uniforms.src.value); + }, + + preloadLogo: function () { + const logo = document.querySelector('#logoBody'); + this.preloadTexture(logo.getObject3D('mesh').children[0].material.uniforms.src.value); + }, + preloadBeamMap: function () { const beams = document.querySelector('[beams]'); this.preloadTexture(beams.components.beams.texture); diff --git a/src/constants/colors-brand.js b/src/constants/colors-brand.js index 736d9d6..6bf3271 100644 --- a/src/constants/colors-brand.js +++ b/src/constants/colors-brand.js @@ -4,6 +4,7 @@ module.exports = { BLUE: '#08bfa2', UI_ACCENT: '#08bfa2', + UI_ACCENT2: '#f01978', SKY_OFF: '#297547', SKY_BLUE: '#840d42', diff --git a/src/constants/colors-orig.js b/src/constants/colors-orig.js index b64ec67..78bdc31 100644 --- a/src/constants/colors-orig.js +++ b/src/constants/colors-orig.js @@ -4,6 +4,7 @@ module.exports = { BLUE: '#00f', UI_ACCENT: '#067197', + UI_ACCENT2: '#f00', SKY_OFF: '#222', SKY_BLUE: '#007AB8', diff --git a/src/constants/colors.js b/src/constants/colors.js index c1a41f0..0cb825e 100644 --- a/src/constants/colors.js +++ b/src/constants/colors.js @@ -4,6 +4,7 @@ module.exports = { BLUE: '#08bfa2', UI_ACCENT: '#08bfa2', + UI_ACCENT2: '#f01978', SKY_OFF: '#297547', SKY_BLUE: '#840d42', diff --git a/src/templates/gameMenu.html b/src/templates/gameMenu.html index e939ffe..5d580f8 100644 --- a/src/templates/gameMenu.html +++ b/src/templates/gameMenu.html @@ -13,8 +13,8 @@ - - + + + mixin="font" text="wrapCount: 40; align: center; color: {{ COLORS.UI_ACCENT }}" bind__text="value: menuSelectedChallenge.songSubName"> diff --git a/src/templates/leaderboard.html b/src/templates/leaderboard.html index 42e2f5c..c5fe8bd 100644 --- a/src/templates/leaderboard.html +++ b/src/templates/leaderboard.html @@ -33,7 +33,7 @@ mixin="font" bind__text="value: leaderboardNames" bind__visible="!leaderboardQualified && !leaderboardEmpty" - text="baseline: center; width: 1.2; anchor: left; color: #00acfc; wrapCount: 28; lineHeight: 53;" + text="baseline: center; width: 1.2; anchor: left; color: {{ COLORS.UI_ACCENT }}; wrapCount: 28; lineHeight: 53;" position="-0.7 -0.16 0.001"> + position="0.9 -0.5 0.01"> + + text="value: If you liked Super Saber,\nyou'll love Soundboxing!\nPlay it now instantly.; letterSpacing: 2; opacity: 0; baseline: bottom; width: 0.7; wrapCount: 28; align: center; color: #fa83d9;"> diff --git a/src/templates/stage.html b/src/templates/stage.html index 3bf29f2..571f616 100644 --- a/src/templates/stage.html +++ b/src/templates/stage.html @@ -72,7 +72,7 @@ position="0 -19 5"> @@ -114,7 +114,7 @@