Compare commits

34 Commits

Author SHA1 Message Date
f654d4f55b fix: listen all ip
All checks were successful
Deploy Static Website / Deploy to Web Server (push) Successful in 1m35s
2023-12-25 00:33:21 +08:00
bb2a674bd1 feat: update ci
All checks were successful
Deploy Static Website / Deploy to Web Server (push) Successful in 1m49s
2023-12-25 00:27:21 +08:00
914cefe780 Merge branch 'main' of https://git.mamahaha.work/sangge/hhl_project 2023-12-25 00:25:15 +08:00
e9a93d8686 feat: create ci 2023-12-25 00:25:13 +08:00
8a427f9a06 更改松饼位置 2023-12-25 00:15:02 +08:00
348a826919 更改图片位置 2023-12-25 00:01:14 +08:00
94a41fafc6 Merge branch 'main' of https://git.mamahaha.work/sangge/hhl_project 2023-12-24 23:54:45 +08:00
8bda6455c1 更改伊丽莎白餐厅图片位置大小 2023-12-24 23:54:43 +08:00
5c5ef6d063 Merge branch 'main' of https://git.mamahaha.work/sangge/hhl_project 2023-12-24 23:49:33 +08:00
0777856416 fix: name error 2023-12-24 23:49:31 +08:00
05c06e938b Merge branch 'main' of https://git.mamahaha.work/sangge/hhl_project 2023-12-24 23:48:33 +08:00
0b482f6381 更改图片位置 2023-12-24 23:48:31 +08:00
fd91742e9c feat: add hint page 2023-12-24 23:39:02 +08:00
74f8a5fc6e Merge branch 'main' of https://git.mamahaha.work/sangge/hhl_project 2023-12-24 23:31:52 +08:00
9e5ab8ac43 增加四个提示页面 2023-12-24 23:31:49 +08:00
d7972b6874 Merge branch 'main' of https://git.mamahaha.work/sangge/hhl_project 2023-12-24 23:26:52 +08:00
9601cbb666 fix: show eliza dishes 2023-12-24 23:26:51 +08:00
7c883376d1 Merge branch 'main' of https://git.mamahaha.work/sangge/hhl_project 2023-12-24 23:20:17 +08:00
75068b2740 更改图片位置 2023-12-24 23:20:14 +08:00
2888464a13 fix: fix desktop error 2023-12-24 23:19:21 +08:00
5ba581fdff Merge branch 'main' of https://git.mamahaha.work/sangge/hhl_project 2023-12-24 23:15:49 +08:00
c15ff448fe feat: update dishes id 2023-12-24 23:15:27 +08:00
3904a8174e Merge branch 'main' of https://git.mamahaha.work/sangge/hhl_project 2023-12-24 23:13:29 +08:00
5ebd8ffb97 更改id 2023-12-24 23:12:26 +08:00
3fa9f99fce feat: show dished 2023-12-24 23:10:37 +08:00
e8cf6f9744 Merge branch 'main' of https://git.mamahaha.work/sangge/hhl_project 2023-12-24 23:07:25 +08:00
ef91aa2fff fix: rename background 2023-12-24 23:07:24 +08:00
b86c0e6a76 Merge branch 'main' of https://git.mamahaha.work/sangge/hhl_project 2023-12-24 23:03:11 +08:00
ba7726cf43 更改图片位置 2023-12-24 23:01:01 +08:00
d4e9714be2 Merge pull request 'main' (#9) from Hanlin_Huang/hhl_project:main into main
Reviewed-on: #9
2023-12-24 22:57:08 +08:00
459ea42d13 图片位置 2023-12-24 22:56:12 +08:00
70eea2d0e3 Merge pull request 'main' (#4) from sangge/hhl_project:main into main
Reviewed-on: Hanlin_Huang/hhl_project#4
2023-12-24 22:47:47 +08:00
1088fb79ac 设置顾客参数 2023-12-24 22:45:56 +08:00
d59ca48be1 Merge pull request 'Hanlin_Huang-main' (#8) from Hanlin_Huang-main into main
Reviewed-on: #8
2023-12-24 22:19:49 +08:00
17 changed files with 201 additions and 93 deletions

View File

@@ -0,0 +1,31 @@
name: Deploy Static Website
on:
push:
branches:
- main
jobs:
deploy:
name: Deploy to Web Server
runs-on: ubuntu-latest
container:
image: catthehacker/ubuntu:act-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
with:
driver: docker
- name: Build Docker image
run: |
docker buildx build . -t git.mamahaha.work/sangge/hhl -f Dockerfile
- name: Start Docker
run: |
docker run -d -p 0.0.0.0:4010:80 git.mamahaha.work/sangge/hhl:latest

17
Dockerfile Normal file
View File

@@ -0,0 +1,17 @@
# 使用官方的 Nginx 镜像作为基础镜像
FROM nginx:latest
# 定义工作目录
WORKDIR /usr/share/nginx/html
# 移除默认的 Nginx 静态资源
RUN rm -rf ./*
# 将静态网页内容复制到容器中
COPY . /usr/share/nginx/html
# 暴露端口 80
EXPOSE 80
# 启动 Nginx 服务
CMD ["nginx", "-g", "daemon off;"]

View File

@@ -41,7 +41,7 @@
<img src="asset/pic/qinshihuang/hint_bottom.png" alt="提示按钮" onclick="handleHint('bottom');">
</div>
<div id="hintpage" class="hintpage">
<img src="asset/pic/qinshihuang/hint_page.png" alt="提示" onclick="handleHint('page');">
<img src="asset/pic/alexander/hint_page.png" alt="提示" onclick="handleHint('page');">
</div>
<div id="customer1" class="customer">
<img src="asset/pic/qinshihuang/Customer1_YoungMan.png" alt="中年男">

Binary file not shown.

After

Width:  |  Height:  |  Size: 805 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 922 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 534 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 738 KiB

View File

@@ -31,11 +31,11 @@
<div class="image-container">
<img src="asset/pic/Character_Selection.png" alt="选择角色">
<button class="button button1" onclick="location.href='alexgame.html'">亚历山大</button>
<button class="button button2" onclick="location.href='louisgame.html'">路易十六</button>
<button class="button button3" onclick="location.href='qinshihuanggame.html'">秦始皇</button>
<button class="button button4" onclick="location.href='elizabethgame.html'">伊丽莎白</button>
<button class="button button5" onclick="location.href='nixongame.html'">尼克松</button>
<button class="button button1" onclick="location.href='alexgame.html'">Alexander</button>
<button class="button button2" onclick="location.href='louisgame.html'">Louis XVI</button>
<button class="button button3" onclick="location.href='qinshihuanggame.html'">Qin Shi Huang</button>
<button class="button button4" onclick="location.href='elizabethgame.html'">Elizabeth I</button>
<button class="button button5" onclick="location.href='nixongame.html'">Nixon</button>
</div>
</body>

View File

@@ -20,6 +20,10 @@
height: 1024px;
top:50px;
left: -100px;
height: 884px!important;
width: 883px!important;
top: 204px!important;
left: 40px!important;
}
#restaurant .dish img {
position: absolute;
@@ -132,27 +136,39 @@
display: none;
}
#lamb img{
left: -10px;
left: -1px;
top: 643px!important;
width: 268px!important;
height: 268px!important;
display: none;
}
#yoghurt img{ /* 芝士 */
left: 170px;
left: 248px;
top: 679px!important;
width: 228px!important;
height: 228px!important;
display: none;
}
#moussaka img{
left: 380px;
left: 461px;
top: 673px!important;
width: 258px!important;
height: 258px!important;
display: none;
}
#salad img{
left: 590px;
left: 749px;
top: 675px!important;
width: 258px!important;
height: 258px!important;
display: none;
}
#cheese img{
left: 750px;
top: 719px!important;
width: 181px!important;
height: 183px!important;
left: 1021px;
top: 678px!important;
width: 232px!important;
height: 232px!important;
display: none;
}

View File

@@ -132,27 +132,38 @@
display: none;
}
#fish_chips img{
left: -10px;
left: 18px;
top: 628px!important;
width: 300px!important;
height: 300px!important;
display: none;
}
#english_breakfast img{
left: 170px;
left: 254px;
top: 640px!important;
width: 259px!important;
height: 259px!important;
display: none;
}
#pudding img{
left: 380px;
left: 510px;
top: 680px!important;
width: 190px!important;
height: 190px!important;
display: none;
}
#spaghetti_bolognes img{
left: 590px;
left: 725px;
top: 673px!important;
width: 224px!important;
height: 224px!important;
display: none;
}
#cream_tea img{
left: 750px;
top: 719px!important;
width: 181px!important;
height: 183px!important;
left: 954px;
top: 623px!important;
width: 259px!important;
height: 259px!important;
display: none;
}

View File

@@ -20,6 +20,10 @@
height: 1024px;
top:50px;
left: -100px;
height: 884px!important;
width: 883px!important;
top: 204px!important;
left: 40px!important;
}
#restaurant .dish img {
position: absolute;
@@ -31,14 +35,16 @@
#restaurant .empire img {
position: absolute;
width: 800px;
height: 800px;
width: 833px;
height: 835px;
top: 279px;
left: 1006px;
z-index: 4;
}
#louis img{ /* louis 16 */
top: 235px;
left: 1050px;
top: 279px;
left: 1006px;
display: none;
}
#louis1 img{ /* 断头台 */
@@ -133,26 +139,40 @@
}
#champagne img{ /* 香槟 */
left: -10px;
display: none;
left: -8px;
top: 728px!important;
width: 163px!important;
height: 177px!important;
}
#cheese img{ /* 芝士 */
left: 170px;
left: 159px;
display: none;
top: 734px!important;
width: 182px!important;
height: 207px!important;
}
#crepe img{
left: 380px;
display: none;
left: 347px;
top: 735px!important;
width: 194px!important;
height: 202px!important;
}
#foie-gras img{
left: 590px;
left: 563px;
display: none;
top: 750px!important;
width: 190px!important;
height: 191px!important;
z-index: 3!important;
}
#onion-soup img{
left: 750px;
top: 719px!important;
width: 181px!important;
height: 183px!important;
top: 725px!important;
width: 200px!important;
height: 207px!important;
display: none;
}

View File

@@ -1,13 +1,13 @@
body {
background-image: url('../asset/pic/louis16/LouisXVI_Restaurant.png');
background-image: url('../asset/pic/nixon/background.png');
background-repeat: no-repeat;
background-color: rgb(0, 136, 109);
}
#desk{
#desktop{
position: absolute;
background-repeat: no-repeat;
}
#desk img{
#desktop img{
left: -10px;
top: -10px;
position: absolute;
@@ -16,9 +16,9 @@
#restaurant .customer img {
position: absolute;
z-index: 0;
width: 1024px;
height: 1024px;
top:50px;
width: 999px;
height: 999px;
top: 88px;
left: -100px;
}
#restaurant .dish img {
@@ -31,22 +31,24 @@
#restaurant .empire img {
position: absolute;
width: 800px;
height: 800px;
width: 804px;
height: 807px;
top: 305px;
left: 1052px;
z-index: 4;
}
#louis img{ /* louis 16 */
#nixon img{ /* nixon 16 */
top: 305px;
left: 1052px;
display: none;
}
#nixon1 img{ /* 断头台 */
top: 235px;
left: 1050px;
display: none;
}
#louis1 img{ /* 断头台 */
top: 235px;
left: 1050px;
display: none;
}
#louis2 img{ /* 死 */
#nixon2 img{ /* */
top: 235px;
left: 1050px;
display: none;
@@ -132,27 +134,38 @@
display: none;
}
#burger img{
left: -10px;
left: -13px;
top: 682px!important;
width: 229px!important;
height: 248px!important;
display: none;
}
#hot_dog img{
left: 170px;
left: 201px;
top: 709px!important;
width: 229px!important;
height: 248px!important;
display: none;
}
#apple_pie img{
left: 380px;
left: 444px;
top: 709px!important;
width: 229px!important;
height: 248px!important;
display: none;
}
#fried_chicken img{
left: 590px;
left: 692px;
top: 713px!important;
width: 229px!important;
height: 248px!important;
display: none;
}
#pancakes img{
left: 750px;
top: 719px!important;
width: 181px!important;
height: 183px!important;
left: 926px;
top: 709px!important;
width: 213px!important;
height: 233px!important;
display: none;
}

View File

@@ -41,7 +41,7 @@
<img src="asset/pic/qinshihuang/hint_bottom.png" alt="提示按钮" onclick="handleHint('bottom');">
</div>
<div id="hintpage" class="hintpage">
<img src="asset/pic/qinshihuang/hint_page.png" alt="提示" onclick="handleHint('page');">
<img src="asset/pic/elizabeth/hint_page.png" alt="提示" onclick="handleHint('page');">
</div>
<div id="customer1" class="customer">
<img src="asset/pic/qinshihuang/Customer1_YoungMan.png" alt="中年男">
@@ -74,23 +74,23 @@
<!-- foods elements -->
<div id="fish_chips" class="dish">
<img src="asset/pic/elizabeth/fish_chips.png" alt="fish_chip"
onclick="handleClick('cham');">
onclick="handleClick('fish&chips');">
</div>
<div id="english_breakfast" class="dish">
<img src="asset/pic/elizabeth/english_breakfast .png" alt="english_breakfast"
onclick="handleClick('cheese');">
onclick="handleClick('breakfast');">
</div>
<div id="pudding" class="dish">
<img src="asset/pic/elizabeth/Pudding.png" alt="pudding"
onclick="handleClick('crepe');">
onclick="handleClick('pudding');">
</div>
<div id="spaghetti_bolognes" class="dish">
<img src="asset/pic/elizabeth/Spaghetti_Bolognese.png" alt="Spaghetti_Bolognese"
onclick="handleClick('foiegras');">
onclick="handleClick('spaghetti');">
</div>
<div id="cream_tea" class="dish">
<img src="asset/pic/cream_tea.png" alt="cream_tea"
onclick="handleClick('onionsoup');">
<img src="asset/pic/elizabeth/cream_tea.png" alt="cream_tea"
onclick="handleClick('cream_tea');">
</div>
</div>

View File

@@ -159,11 +159,11 @@ document.addEventListener("DOMContentLoaded", function() {
showElement("#dialogueBox img");
// Show all dishes
showElement('#champagne img');
showElement('#cheese img');
showElement('#crepe img');
showElement('#foie-gras img');
showElement('#onion-soup img');
showElement('#fish_chips img');
showElement('#english_breakfast img');
showElement('#pudding img');
showElement('#spaghetti_bolognes img');
showElement('#cream_tea img');
// Show a random customer
showElement(customers[RandomCustomerIndex][0]);

View File

@@ -128,13 +128,13 @@ var answers = [
'ham',
'hotdog',
'applepie',
'frychicken',
'jiangbing',
'friedchicken',
'pancakes',
'ham',
'hotdog',
'applepie',
'frychicken',
'jianbing'
'friedchicken',
'pancakes'
]
var QAlist = Array.from(Array(questions.length).keys());
@@ -159,11 +159,11 @@ document.addEventListener("DOMContentLoaded", function() {
showElement("#dialogueBox img");
// Show all dishes
showElement('#champagne img');
showElement('#cheese img');
showElement('#crepe img');
showElement('#foie-gras img');
showElement('#onion-soup img');
showElement('#burger img');
showElement('#hot_dog img');
showElement('#apple_pie img');
showElement('#fried_chicken img');
showElement('#pancakes img');
// Show a random customer
showElement(customers[RandomCustomerIndex][0]);

View File

@@ -41,7 +41,7 @@
<img src="asset/pic/qinshihuang/hint_bottom.png" alt="提示按钮" onclick="handleHint('bottom');">
</div>
<div id="hintpage" class="hintpage">
<img src="asset/pic/qinshihuang/hint_page.png" alt="提示" onclick="handleHint('page');">
<img src="asset/pic/louis16/hint_page.png" alt="提示" onclick="handleHint('page');">
</div>
<div id="customer1" class="customer">
<img src="asset/pic/qinshihuang/Customer1_YoungMan.png" alt="中年男">

View File

@@ -22,10 +22,10 @@
<div id="nixon" class="empire">
<img src="asset/pic/nixon/nixon_normal.png" alt="nixon">
</div>
<div id="louis1" class="empire">
<div id="nixon1" class="empire">
<img src="asset/pic/nixon/nixon_normal.png" alt="nixon">
</div>
<div id="louis2" class="empire">
<div id="nixon2" class="empire">
<img src="asset/pic/nixon/nixon_die.png" alt="死">
</div>
@@ -41,7 +41,7 @@
<img src="asset/pic/qinshihuang/hint_bottom.png" alt="提示按钮" onclick="handleHint('bottom');">
</div>
<div id="hintpage" class="hintpage">
<img src="asset/pic/qinshihuang/hint_page.png" alt="提示" onclick="handleHint('page');">
<img src="asset/pic/nixon/hint_page.png" alt="提示" onclick="handleHint('page');">
</div>
<div id="customer1" class="customer">
<img src="asset/pic/qinshihuang/Customer1_YoungMan.png" alt="中年男">
@@ -72,25 +72,25 @@
</div>
<!-- foods elements -->
<div id="champagne" class="dish">
<div id="burger" class="dish">
<img src="asset/pic/nixon/burger.png" alt="burger"
onclick="handleClick('cham');">
onclick="handleClick('hamburger');">
</div>
<div id="cheese" class="dish">
<div id="hot_dog" class="dish">
<img src="asset/pic/nixon/hot_dog.png" alt="hot_dog"
onclick="handleClick('cheese');">
onclick="handleClick('hotdog');">
</div>
<div id="crepe" class="dish">
<div id="apple_pie" class="dish">
<img src="asset/pic/nixon/apple_pie.png" alt="apple_pie"
onclick="handleClick('crepe');">
</div>
<div id="foie-gras" class="dish">
<div id="fried_chicken" class="dish">
<img src="asset/pic/nixon/fried_chicken.png" alt="fried_chicken"
onclick="handleClick('foiegras');">
onclick="handleClick('friedchicken');">
</div>
<div id="onion-soup" class="dish">
<div id="pancakes" class="dish">
<img src="asset/pic/nixon/pancakes.png" alt="pancakes"
onclick="handleClick('onionsoup');">
onclick="handleClick('pancakes');">
</div>
</div>