Skip to content

Commit

Permalink
Merge branch 'dev' of github.com:eesast/THUAI7 into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Grange007 committed Nov 10, 2023
2 parents 1e347a4 + 046afb4 commit 0f1923b
Show file tree
Hide file tree
Showing 86 changed files with 3,809 additions and 162 deletions.
36 changes: 33 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: build
on: [push, pull_request]
jobs:
dotnet-build:
dotnet-build-logic:
if: true
runs-on: windows-latest
steps:
Expand All @@ -14,11 +14,41 @@ jobs:
- name: Build Logic
run: dotnet build "./logic/logic.sln" -c Release

dotnet-build-install:
if: true
runs-on: windows-latest
steps:
- uses: actions/checkout@v4
- name: Setup .NET Core
uses: actions/setup-dotnet@v3
with:
dotnet-version: 7.0.x

- name: Build Installer
run: dotnet build "./installer/installer.sln" -c Release
run: dotnet build "./installer/installer.sln" -c Release -f net7.0-windows10.0.19041.0

dotnet-build-launcher:
if: true
runs-on: windows-latest
steps:
- uses: actions/checkout@v4
- name: Setup .NET Core
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x

- name: Build Launcher
run: dotnet build "./launcher/launcher.sln" -c Release


dotnet-build-playback:
if: true
runs-on: windows-latest
steps:
- uses: actions/checkout@v4
- name: Setup .NET Core
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x

- name: Build Playback
run: dotnet build "./playback/playback.sln" -c Release
33 changes: 30 additions & 3 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
exclude: './players'
inplace: False

dotnet-format-checking:
dotnet-format-checking-logic:
runs-on: windows-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -26,17 +26,44 @@ jobs:
run: |
dotnet restore "./logic/logic.sln"
dotnet format "./logic/logic.sln" --severity error --no-restore --verify-no-changes
dotnet-format-checking-installer:
runs-on: windows-latest
steps:
- uses: actions/checkout@v4
- name: Setup .NET Core
uses: actions/setup-dotnet@v3
with:
dotnet-version: 7.0.x

- name: Check Installer
run: |
dotnet restore "./installer/installer.sln"
dotnet format "./installer/installer.sln" --severity error --no-restore --verify-no-changes
dotnet-format-checking-launcher:
runs-on: windows-latest
steps:
- uses: actions/checkout@v4
- name: Setup .NET Core
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x

- name: Check Launcher
run: |
dotnet restore "./launcher/launcher.sln"
dotnet format "./launcher/launcher.sln" --severity error --no-restore --verify-no-changes
dotnet-format-checking-playback:
runs-on: windows-latest
steps:
- uses: actions/checkout@v4
- name: Setup .NET Core
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x

- name: Check Playback
run: |
dotnet restore "./playback/playback.sln"
Expand Down
3 changes: 3 additions & 0 deletions dependency/MapGenerator/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# THUAI7 随机地图生成器

地图生成逻辑极为简单,有待其他大佬进一步改进。
62 changes: 62 additions & 0 deletions dependency/MapGenerator/assets/css/map.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
#paint {
float: left;
}

#paint canvas {
border: 1px solid #333;
border-radius: 10px;
cursor: crosshair;
margin: 0 20px 20px 0;
}

#color-picker {
float: left;
}

#color-picker div {
width: 120px;
height: 40px;
text-align: center;
cursor: pointer;
margin: 14px;
border-radius: 10px;
border: 1px solid #000;
}

#color-picker div:hover {
border: 1px solid #333;
box-shadow: 0 0 5px #333;
text-shadow: 0 0 5px #333;
}

#color-picker div p {
font-size: 16px;
font-weight: 500;
line-height: 40px;
margin: 0;
}

#random-settings {
float: left;
}

#random-settings p {
font-size: 16px;
font-weight: 500;
margin: 0 0 10px;
text-align: right;
}

#random-settings p:hover {
color: #025b9e;
}

#random-settings input {
border-radius: 5px;
border: 1px solid #333;
width: 64px;
}

#operate {
clear: both;
}
185 changes: 185 additions & 0 deletions dependency/MapGenerator/assets/css/style.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,185 @@
html {
box-sizing: border-box;
font-family: 'Roboto', sans-serif;
background-color: #fff;
}

header {
background-color: #fff;
border-bottom: 1px solid #eee;
height: 60px;
line-height: 60px;
position: fixed;
top: 0;
width: 100%;
z-index: 999;
}

header .logo {
float: left;
margin-left: 30px;
}

header .logo a {
color: #333;
font-size: 20px;
font-weight: 700;
text-decoration: none;
}

header .logo a:hover {
color: #025b9e;
}

header .logo img {
height: 40px;
margin-top: 10px;
}

header .top-nav {
float: right;
margin-right: 30px;
}

header .top-nav ul {
list-style: none;
margin: 0;
padding: 0;
}

header .top-nav ul li {
display: inline-block;
margin-left: 20px;
position: relative;
}

header .top-nav ul li a {
color: #333;
font-size: 16px;
font-weight: 500;
text-decoration: none;
}

header .top-nav ul li a:hover {
color: #025b9e;
}

main {
margin-top: 60px;
padding: 30px;
}

main h1 {
color: #333;
font-size: 24px;
font-weight: 700;
margin: 0 0 20px;
}

main h2 {
color: #333;
font-size: 20px;
font-weight: 700;
margin: 0 0 20px;
}

main p {
color: #333;
font-size: 16px;
font-weight: 400;
line-height: 1.5;
margin: 0 0 20px;
}

main a {
color: #027dcd;
font-size: 16px;
font-weight: 500;
text-decoration: none;
}

main a:hover {
color: #025b9e;
}

main ul {
/* list-style: none; */
margin: 0;
/* padding: 0; */
}

main ul li {
margin-bottom: 20px;
}

main ul li a {
color: #333;
font-size: 16px;
font-weight: 500;
/* text-decoration: none; */
}

main ul li a:hover {
color: #025b9e;
}

main button {
background-color: #027dcd;
border: 0;
border-radius: 10px;
color: #fff;
cursor: pointer;
font-size: 16px;
font-weight: 500;
height: 40px;
margin-bottom: 20px;
padding: 0 20px;
}

main button:hover {
background-color: #025b9e;
box-shadow: 0 0 5px #333;
text-shadow: 0 0 5px #333;
}

main fieldset {
border: 1px solid #333;
border-radius: 10px;
margin-bottom: 20px;
padding: 20px;
}

main fieldset legend {
color: #333;
font-size: 16px;
font-weight: 500;
}

main fieldset label {
color: #333;
font-size: 16px;
font-weight: 500;
}

main fieldset input[type="text"],
main fieldset input[type="email"],
main fieldset input[type="password"],
main fieldset select {
border: 1px solid #eee;
border-radius: 10px;
color: #333;
font-size: 16px;
font-weight: 400;
height: 40px;
margin-bottom: 20px;
padding: 0 10px;
width: 100%;
}

main fieldset input[type="text"]:focus,
main fieldset input[type="email"]:focus,
main fieldset input[type="password"]:focus,
main fieldset select:focus {
border: 1px solid #333;
box-shadow: 0 0 5px #333;
}
Binary file added dependency/MapGenerator/assets/img/favicon.ico
Binary file not shown.
Loading

0 comments on commit 0f1923b

Please sign in to comment.