Merge branch 'lubo'

# Conflicts:
#	Common.py
#	Demo/Xigua.proto
#	Demo/XiguaGift.proto
#	Demo/XiguaUser.proto
#	README.md
#	WebMain.py
#	WinMain.py
#	api.py
#	bilibili.py
#	liveDownloader.py
#	templates/head.html
This commit is contained in:
2021-05-19 12:28:01 +08:00
15 changed files with 1365 additions and 15557 deletions

13
templates/head.html Normal file
View File

@ -0,0 +1,13 @@
<meta charset="UTF-8">
<script src="https://cdn.staticfile.org/jquery/3.3.1/jquery.min.js"></script>
<style>
td{
border: solid 1px lightgray;
}
.title{
width: 6em;
}
.time{
width: 10em;
}
</style>