Skip to content

Commit

Permalink
conflict solved
Browse files Browse the repository at this point in the history
  • Loading branch information
thely314 committed Nov 18, 2023
2 parents d144d76 + c421599 commit 039066c
Showing 1 changed file with 65 additions and 65 deletions.
130 changes: 65 additions & 65 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,65 +1,65 @@
<!DOCTYPE html>
<html lang="zh" dir="ltr">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>thely314's personal page</title>
<link rel="stylesheet" type="text/css" href="css/style.css">
</head>
<body background="img/blackBlockBG.jpg" style="background-repeat:no-repeat;background-size:100% 100%;background-attachment: fixed;">
<h1>title</h1>
<p>this page is being building, please stay turned:)</p>
<h2>subTitle</h2>
<b>this page is being building, please stay turned:)</b>
<h3>子标题</h3>
<strong>不清楚,试一下</strong><br>
<a href="https://github.com/">goto github</a><br>
<a href="https://www.bilibili.com/">goto bilibili</a><br>
<br>
<button id="magic" onclick="magicSpell()">这是什么,按一下
<audio id="magicSound" src="music/magicSpell.wav"></audio>
</button>

<div id="contianer">
<div id="listTitle">
<h3>音乐列表(部分音乐存在前奏延迟)</h3>
</div>
<div id="audioList">
<ul>
<li onclick="change(0)">果てなき風の軌跡さえ~破~</li>
<li onclick="change(1)">琪露诺的完美算术教室</li>
<li onclick="change(2)">琪露诺的完美算数教室⑨周年版</li>
<li onclick="change(3)">NEEDY GIRL OVERDOSE</li>
<li onclick="change(4)">INTERNET YAMERO</li>
<li onclick="change(5)">二人の魔法</li>
<li onclick="change(6)">Sweet Treasure (Inst.)</li>
</ul>
</div>
<div>
<p id="currentMusic">当前播放: 果てなき風の軌跡さえ~破~</p>
</div>

<div id="player">
<audio id="audioPlayer" src="music/果てなき風の軌跡さえ~破~.mp3" onended="next()" ></audio>
<div id="controls">
<button id="playBtn" class="btn">
<img src="img/startButton.png" onmousedown="play()" id="musicImg" alt="start/pause" style="height: 30px;width: 25px;">
<br>播放/暂停
</button>
<button id="endBtn" class="btn">
<img src="img/endButton.png" onmousedown="end()" alt="stop" style="height: 30px;width: 25px;">
<br>返回开头
</button>
<button id="nextBtn" class="btn">
<img src="img/nextButton.png" onmousedown="next()" alt="next" style="height: 30px;width: 25px;">
<br>下一个
</button>
<br>
<input type="range" id="volumeSlider" min="0" max="1" step="0.1" value="0.2" onchange="changeVolume(this.value)">
<label for="volumeSlider" id="volumeLabel">音量: 20%</label>
</div>
</div>
</div>
<script src="js/index.js" type="text/javascript"></script>
</body>
</html>
<!DOCTYPE html>
<html lang="zh" dir="ltr">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>thely314's personal page</title>
<link rel="stylesheet" type="text/css" href="css/style.css">
</head>
<body background="img/blackBlockBG.jpg" style="background-repeat:no-repeat;background-size:100% 100%;background-attachment: fixed;">
<h1>title</h1>
<p>this page is being building, please stay turned:)</p>
<h2>subTitle</h2>
<b>this page is being building, please stay turned:)</b>
<h3>子标题</h3>
<strong>不清楚,试一下</strong><br>
<a href="https://github.com/">goto github</a><br>
<a href="https://www.bilibili.com/">goto bilibili</a><br>
<br>
<button id="magic" onclick="magicSpell()">这是什么,按一下
<audio id="magicSound" src="music/magicSpell.wav"></audio>
</button>

<div id="contianer">
<div id="listTitle">
<h3>音乐列表(部分音乐存在前奏延迟)</h3>
</div>
<div id="audioList">
<ul>
<li onclick="change(0)">果てなき風の軌跡さえ~破~</li>
<li onclick="change(1)">琪露诺的完美算术教室</li>
<li onclick="change(2)">琪露诺的完美算数教室⑨周年版</li>
<li onclick="change(3)">NEEDY GIRL OVERDOSE</li>
<li onclick="change(4)">INTERNET YAMERO</li>
<li onclick="change(5)">二人の魔法</li>
<li onclick="change(6)">Sweet Treasure (Inst.)</li>
</ul>
</div>
<div>
<p id="currentMusic">当前播放: 果てなき風の軌跡さえ~破~</p>
</div>

<div id="player">
<audio id="audioPlayer" src="music/果てなき風の軌跡さえ~破~.mp3" onended="next()" ></audio>
<div id="controls">
<button id="playBtn" class="btn">
<img src="img/startButton.png" onmousedown="play()" id="musicImg" alt="start/pause" style="height: 30px;width: 25px;">
<br>播放/暂停
</button>
<button id="endBtn" class="btn">
<img src="img/endButton.png" onmousedown="end()" alt="stop" style="height: 30px;width: 25px;">
<br>返回开头
</button>
<button id="nextBtn" class="btn">
<img src="img/nextButton.png" onmousedown="next()" alt="next" style="height: 30px;width: 25px;">
<br>下一个
</button>
<br>
<input type="range" id="volumeSlider" min="0" max="1" step="0.1" value="0.2" onchange="changeVolume(this.value)">
<label for="volumeSlider" id="volumeLabel">音量: 20%</label>
</div>
</div>
</div>
<script src="js/index.js" type="text/javascript"></script>
</body>
</html>

0 comments on commit 039066c

Please sign in to comment.