Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
gorisanson committed Jun 2, 2020
2 parents ac96e64 + dff2ac1 commit 0e50acc
Show file tree
Hide file tree
Showing 31 changed files with 2,480 additions and 208 deletions.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
"webpack-merge": "^4.2.2"
},
"dependencies": {
"file-saver": "^2.0.2",
"firebase": "^7.14.5",
"pixi-sound": "3.0.4",
"pixi.js-legacy": "5.2.4",
Expand Down
124 changes: 67 additions & 57 deletions src/en/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ <h1>Pikachu Volleyball <span class="no-wrap">P2P Online</span></h1>
>the offline web version here</a
>.
</p>
<p class="small"><a href="./replay/">Replay Viewer is here</a>.</p>
<p class="original-by">
The original Pikachu Volleyball (対戦ぴかちゅ~ ビーチバレー編) was
developed by<br />
Expand Down Expand Up @@ -310,6 +311,10 @@ <h1>Pikachu Volleyball <span class="no-wrap">P2P Online</span></h1>
<div id="connection-failed" class="hidden">
Connection failed.
</div>
<div id="replay-viewer-at" class="hidden">
Replay Viewer at:
https://gorisanson.github.io/pikachu-volleyball-p2p-online/en/replay/
</div>
<div id="test-passed" class="fade-in-box notice fixed hidden">
No issues are detected.<br /><br />
(1) The necessary server reflexive candidate can be gotten, or your
Expand Down Expand Up @@ -391,73 +396,78 @@ <h1>Pikachu Volleyball <span class="no-wrap">P2P Online</span></h1>
</div>
<div id="flex-container" class="hidden">
<div id="menu-bar">
<div class="relative-container">
<button id="options-dropdown-btn" class="btn dropdown-btn">
Options
</button>
<div id="options-dropdown" class="dropdown">
<div class="relative-container">
<button id="bgm-submenu-btn" class="btn submenu-btn">
BGM &#9654;
</button>
<div id="bgm-submenu" class="submenu">
<button id="bgm-on-btn" class="btn selected">
<span class="check">&check; </span>on
</button>
<button id="bgm-off-btn" class="btn">
<span class="check">&check; </span>off
<div class="btn-container left">
<div class="relative-container">
<button id="options-dropdown-btn" class="btn dropdown-btn">
Options
</button>
<div id="options-dropdown" class="dropdown">
<div class="relative-container">
<button id="bgm-submenu-btn" class="btn submenu-btn">
BGM &#9654;
</button>
<div id="bgm-submenu" class="submenu">
<button id="bgm-on-btn" class="btn selected">
<span class="check">&check; </span>on
</button>
<button id="bgm-off-btn" class="btn">
<span class="check">&check; </span>off
</button>
</div>
</div>
</div>
<div class="relative-container">
<button id="sfx-submenu-btn" class="btn submenu-btn">
SFX &#9654;
</button>
<div id="sfx-submenu" class="submenu">
<button id="stereo-btn" class="btn selected">
<span class="check">&check; </span>stereo
</button>
<button id="mono-btn" class="btn">
<span class="check">&check; </span>mono
</button>
<button id="sfx-off-btn" class="btn">
<span class="check">&check; </span>off
<div class="relative-container">
<button id="sfx-submenu-btn" class="btn submenu-btn">
SFX &#9654;
</button>
<div id="sfx-submenu" class="submenu">
<button id="stereo-btn" class="btn selected">
<span class="check">&check; </span>stereo
</button>
<button id="mono-btn" class="btn">
<span class="check">&check; </span>mono
</button>
<button id="sfx-off-btn" class="btn">
<span class="check">&check; </span>off
</button>
</div>
</div>
</div>
<div class="relative-container">
<button id="speed-submenu-btn" class="btn submenu-btn">
Speed &#9654;
</button>
<div id="speed-submenu" class="submenu">
<button id="slow-speed-btn" class="btn">
<span class="check">&check; </span>slow
</button>
<button id="medium-speed-btn" class="btn selected">
<span class="check">&check; </span>medium
</button>
<button id="fast-speed-btn" class="btn">
<span class="check">&check; </span>fast
<div class="relative-container">
<button id="speed-submenu-btn" class="btn submenu-btn">
Speed &#9654;
</button>
<div id="speed-submenu" class="submenu">
<button id="slow-speed-btn" class="btn">
<span class="check">&check; </span>slow
</button>
<button id="medium-speed-btn" class="btn selected">
<span class="check">&check; </span>medium
</button>
<button id="fast-speed-btn" class="btn">
<span class="check">&check; </span>fast
</button>
</div>
</div>
</div>
<div class="relative-container">
<button id="winning-score-submenu-btn" class="btn submenu-btn">
Winning score &#9654;
</button>
<div id="winning-score-submenu" class="submenu">
<button id="winning-score-5-btn" class="btn">
<span class="check">&check; </span>5 pts
</button>
<button id="winning-score-10-btn" class="btn">
<span class="check">&check; </span>10 pts
</button>
<button id="winning-score-15-btn" class="btn selected">
<span class="check">&check; </span>15 pts
<div class="relative-container">
<button id="winning-score-submenu-btn" class="btn submenu-btn">
Winning score &#9654;
</button>
<div id="winning-score-submenu" class="submenu">
<button id="winning-score-5-btn" class="btn">
<span class="check">&check; </span>5 pts
</button>
<button id="winning-score-10-btn" class="btn">
<span class="check">&check; </span>10 pts
</button>
<button id="winning-score-15-btn" class="btn selected">
<span class="check">&check; </span>15 pts
</button>
</div>
</div>
</div>
</div>
<div class="relative-container">
<button id="save-replay-btn" class="btn">Save replay</button>
</div>
</div>
</div>
<div id="game-canvas-container">
Expand Down
158 changes: 158 additions & 0 deletions src/en/replay/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />

<title>Pikachu Volleyball P2P Online Replay Viewer</title>
<meta
name="description"
content="Pikachu Volleyball P2P Online Replay Viewer"
/>
<meta name="author" content="Lee, Kyutae" />

<link
rel="icon"
type="image/png"
sizes="32x32"
href="../../resources/assets/images/IDI_PIKAICON-0.png"
/>
</head>
<body>
<div id="flex-container">
<div id="game-canvas-container">
<div id="player1-chat-box" class="chat-box pre-wrap"></div>
<div id="player2-chat-box" class="chat-box pre-wrap"></div>
<div class="nicknames-container">
<div class="nickname-and-partial-ip left">
<span id="player1-nickname" class="nickname"></span>
<span id="player1-partial-ip" class="partial-ip"></span>
</div>
<div class="nickname-and-partial-ip right">
<span id="player2-nickname" class="nickname"></span>
<span id="player2-partial-ip" class="partial-ip"></span>
</div>
</div>
<div class="fade-in-box loading black hidden" id="loading-box">
<div>
<p>Loading the game assets...</p>
<div id="progress-bar-border">
<div id="progress-bar" style="width: 0%;"></div>
</div>
</div>
</div>
<div id="dropbox" class="fade-in-box">
<label class="custom-file-upload">
Open File
<input id="file-input" type="file" />
</label>
<p>
Use "Open File" button or drag a replay file here
</p>
</div>
<div class="fade-in-box notice hidden" id="notice-end-of-replay">
<p>
Replay is over
</p>
<button id="notice-end-of-replay-ok-btn" class="btn-in-box">
OK
</button>
</div>
<div class="fade-in-box notice hidden" id="notice-file-open-error">
<p>
The file can't be opened.<br />It is not a replay file, or it is
damaged.
</p>
<button id="notice-file-open-error-ok-btn" class="btn-in-box">
OK
</button>
</div>
</div>
<div>
<input
id="scrubber-range-input"
class="disable-dbl-tap-zoom"
type="range"
min="0"
max="100"
value="0"
/>
</div>
<div>
<button id="play-pause-btn" class="btn-for-replay disable-dbl-tap-zoom">
&#x25b6;
</button>
<span class="margin-left-right"
><span id="time-current">0:00</span> /
<span id="time-duration">0:00</span></span
>
<div class="inline">
<button
id="seek-backward-3"
class="btn-for-replay disable-dbl-tap-zoom"
>
&lt;&lt; 3
</button>
<button
id="seek-backward-1"
class="btn-for-replay disable-dbl-tap-zoom"
>
&lt;&lt; 1
</button>
<button
id="seek-forward-1"
class="btn-for-replay disable-dbl-tap-zoom"
>
1 &gt;&gt;
</button>
<button
id="seek-forward-3"
class="btn-for-replay disable-dbl-tap-zoom"
>
3 &gt;&gt;
</button>
</div>
<div class="margin-top-little">
<button
id="speed-btn-1-fps"
class="btn-for-replay disable-dbl-tap-zoom"
>
1 fps
</button>
<button
id="speed-btn-2-fps"
class="btn-for-replay disable-dbl-tap-zoom"
>
2 fps
</button>
<button
id="speed-btn-5-fps"
class="btn-for-replay disable-dbl-tap-zoom"
>
5 fps
</button>
<button
id="speed-btn-half-times"
class="btn-for-replay disable-dbl-tap-zoom"
>
&times;0.5
</button>
<button
id="speed-btn-1-times"
class="btn-for-replay disable-dbl-tap-zoom selected"
>
&times;1
</button>
<button
id="speed-btn-2-times"
class="btn-for-replay disable-dbl-tap-zoom"
>
&times;2
</button>
</div>
</div>
<div id="play-mark" class="hidden">&#x25b6;</div>
<div id="pause-mark" class="hidden">&#x275a;&#x275a;</div>
</div>
</body>
</html>
Loading

0 comments on commit 0e50acc

Please sign in to comment.