YunFeiyang
/
noname
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #391 from Tipx-L/PR-Branch 

The Database Update.
This commit is contained in:
Spmario233 2023-09-26 00:18:58 +08:00 committed by GitHub
parent 1746425bb0 20b5b13bb6
commit 3a78039ec8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 1127 additions and 1177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
character/diy.js
View File

@ -181,7 +181,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
old_jiakui:['male','wei',4,['tongqu','xinwanlan']],
ol_guohuai:['male','wei',3,['rejingce']],
junk_zhangrang:['male','qun',3,['junktaoluan']],
junk_zhangrang:['male','qun',3,['junktaoluan'],['sex:male_castrated']],
old_bulianshi:['female','wu',3,['anxu','zhuiyi']],
ol_maliang:['male','shu',3,['zishu','xinyingyuan']],
junk_liubei:['male','shu',4,['junkrende','jijiang'],['zhu']],

22
character/mobile.js
View File

@ -30,7 +30,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
xin_zhangyi:['male','shu',4,['xinwurong','shizhi']],
xin_sunliang:['male','wu',3,['xinzhizheng','xinkuizhu','xinlijun'],['zhu']],
re_xiaoqiao:['female','wu',3,['retianxiang','xinhongyan']],
shichangshi:['male','qun',1,['mbdanggu','mbmowang']],
shichangshi:['male','qun',1,['mbdanggu','mbmowang'],['sex:male_castrated']],
re_zhangzhang:['male','wu',3,['rezhijian','guzheng']],
qianzhao:['male','wei',4,['mbshihe','mbzhenfu']],
re_yanwen:["male","qun",4,["reshuangxiong"]],
@ -153,16 +153,16 @@ game.import('character',function(lib,game,ui,get,ai,_status){
re_liushan:['male','shu',3,['xiangle','refangquan','ruoyu'],['zhu']],
re_sunben:['male','wu',4,['jiang','rehunzi','zhiba'],['zhu']],
scs_zhangrang:['male','qun','',['scstaoluan'],['unseen']],
scs_zhaozhong:['male','qun','',['scschiyan'],['unseen']],
scs_sunzhang:['male','qun','',['scszimou'],['unseen']],
scs_bilan:['male','qun','',['scspicai'],['unseen']],
scs_xiayun:['male','qun','',['scsyaozhuo'],['unseen']],
scs_hankui:['male','qun','',['scsxiaolu'],['unseen']],
scs_lisong:['male','qun','',['scskuiji'],['unseen']],
scs_duangui:['male','qun','',['scschihe'],['unseen']],
scs_guosheng:['male','qun','',['scsniqu'],['unseen']],
scs_gaowang:['male','qun','',['scsmiaoyu'],['unseen']],
scs_zhangrang:['male','qun','',['scstaoluan'],['unseen','sex:male_castrated']],
scs_zhaozhong:['male','qun','',['scschiyan'],['unseen','sex:male_castrated']],
scs_sunzhang:['male','qun','',['scszimou'],['unseen','sex:male_castrated']],
scs_bilan:['male','qun','',['scspicai'],['unseen','sex:male_castrated']],
scs_xiayun:['male','qun','',['scsyaozhuo'],['unseen','sex:male_castrated']],
scs_hankui:['male','qun','',['scsxiaolu'],['unseen','sex:male_castrated']],
scs_lisong:['male','qun','',['scskuiji'],['unseen','sex:male_castrated']],
scs_duangui:['male','qun','',['scschihe'],['unseen','sex:male_castrated']],
scs_guosheng:['male','qun','',['scsniqu'],['unseen','sex:male_castrated']],
scs_gaowang:['male','qun','',['scsmiaoyu'],['unseen','sex:male_castrated']],
},
characterIntro:{
shichangshi:'十常侍，指中国东汉（公元25年—220年）灵帝时期（168年-189年）操纵政权的十二个宦官：张让、赵忠、夏恽、郭胜、孙璋、毕岚、栗嵩、段珪、高望、张恭、韩悝、宋典（在小说《三国演义》里，十常侍指的是指张让、赵忠、封谞、段珪、曹节、侯览、蹇硕、程旷、夏恽、郭胜十人），他们都任职中常侍。玩弄小皇帝于股掌之中，以至灵帝称“张常侍是我父，赵常侍是我母”。十常侍自己横征暴敛，卖官鬻爵，他们的父兄子弟遍布天下，横行乡里，祸害百姓，无官敢管。人民不堪剥削、压迫，纷纷起来反抗。当时一些比较清醒的官吏，已看出宦官集团的黑暗腐败，导致大规模农民起义的形势。郎中张钧在给皇帝的奏章中明确指出，黄巾起义是外戚宦官专权逼出来的，他说：“张角所以能兴兵作乱，万人所以乐附之者，其源皆由十常侍多放父兄、子弟、婚宗、宾客典据州郡，辜确财利，侵略百姓，百姓之怨无所告诉，故谋议不轨，聚为‘盗贼’。”后被曹操、袁绍所歼。',

2
character/old.js
View File

@ -81,7 +81,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
old_machao:['male','qun',4,['zhuiji','oldcihuai']],
old_zhugezhan:["male","shu",3,["old_zuilun","old_fuyin"]],
zhangliang:["male","qun",4,["old_jijun","old_fangtong"]],
ol_zhangrang:['male','qun',3,['xintaoluan']],
ol_zhangrang:['male','qun',3,['xintaoluan'],['sex:male_castrated']],
ol_guansuo:['male','shu',4,['zhengnan','xiefang']],
//ol_manchong:['male','wei',3,['yuce','junxing']],
old_guanqiujian:["male","wei",4,["drlt_zhenrong","drlt_hongju"],[]],

2
character/yijiang.js
View File

@ -90,7 +90,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
cenhun:['male','wu',4,['jishe','lianhuo']],
huanghao:['male','shu',3,['qinqing','huisheng']],
zhangrang:['male','qun',3,['taoluan']],
zhangrang:['male','qun',3,['taoluan'],['sex:male_castrated']],
sunziliufang:['male','wei',3,['guizao','jiyu']],
xinxianying:['female','wei',3,['zhongjian','caishi']],

2032
game/game.js
View File

File diff suppressed because it is too large Load Diff

1
game/pinyinjs.js
View File

@ -7962,6 +7962,7 @@ var pinyin_dict_polyphone = {
"咖喱": "gā ",
"喀吧": " ba",
"喀嚓": " chā",
"卡比": "kǎ ",
"卡尺": "kǎ chǐ",
"卡车": "kǎ chē",
"卡带": "kǎ ",

BIN
image/card/group_unknown.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.9 KiB

BIN
image/card/sex_double.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
image/card/sex_female.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.5 KiB

BIN
image/card/sex_male.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.3 KiB

BIN
image/card/sex_male_castrated.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.2 KiB

BIN
image/card/sex_none.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.1 KiB

BIN
image/card/sex_unknown.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.2 KiB

21
index.html
View File

@ -1,10 +1,13 @@
<!DOCTYPE HTML>
<meta charset="UTF-8">
<meta name="format-detection" content="telephone=no">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="viewport" content="user-scalable=no, viewport-fit=cover">
<title>无名杀</title>
<script src="game/update.js"></script>
<script src="game/config.js"></script>
<script src="game/package.js"></script>
<script src="game/game.js"></script>
<head>
<meta charset="UTF-8">
<meta name="format-detection" content="telephone=no">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="viewport" content="user-scalable=no, viewport-fit=cover">
<title>无名杀</title>
<script src="game/update.js"></script>
<script src="game/config.js"></script>
<script src="game/package.js"></script>
<script src="game/game.js"></script>
</head>

143
layout/default/layout.css
View File

@ -1616,12 +1616,12 @@ div:not(.handcards)>.card>.info>span,
}
.mark-container.marks>div>.markcount.menubutton {
font-size: 12px;
width: 16px;
height: 16px;
line-height: 18px;
position: absolute;
left: 36px;
top: 34px;
width: 16px;
height: 16px;
line-height: 18px;
position: absolute;
left: 36px;
top: 34px;
border-radius: 100%;
}
.mark-container.marks>.card.fullskin>.image{
@ -1630,11 +1630,11 @@ div:not(.handcards)>.card>.info>span,
}
.mark-container.marks>.card.fullskin>.info{
transform: scale(0.6) !important;
transform-origin: top right;
left: auto !important;
right: 3px !important;
display: block;
top: 2px;
transform-origin: top right;
left: auto !important;
right: 3px !important;
display: block;
top: 2px;
}
.mark-container.marks>.card.fullskin>.name{
transform: scale(0.5) !important;
@ -1645,7 +1645,7 @@ div:not(.handcards)>.card>.info>span,
}
.mark-container.marks>.card.fullskin>.name.long{
transform: scale(0.48) !important;
top: 1px !important;
top: 1px !important;
}
.button.card>.background {
@ -2017,7 +2017,7 @@ div:not(.handcards)>.card>.info>span,
.button.newstyle>.name.long{
top: 6px;
transform: scale(0.93);
transform-origin: top left;
transform-origin: top left;
}
.button.newstyle>.hp,
.button.newstyle>.hp.text{
@ -2046,7 +2046,7 @@ div:not(.handcards)>.card>.info>span,
text-align: right;
width: auto;
height: auto;
transform: none !important;
transform: none !important;
text-shadow: black 0 0 2px, black 0 0 3px;
}
@ -2268,7 +2268,7 @@ div:not(.handcards)>.card>.info>span,
}
.player>.turned>div{
top: calc(50% - 50px);
left: calc(50% - 25px);
left: calc(50% - 25px);
white-space: nowrap;
writing-mode: vertical-rl;
-webkit-writing-mode: vertical-rl;
@ -2503,9 +2503,9 @@ div:not(.handcards)>.card>.info>span,
}
#arena.oldlayout .player>.framebg{
transform: rotate(90deg) translateY(-240px);
width: 120px;
height: 240px;
transform-origin: top left;
width: 120px;
height: 240px;
transform-origin: top left;
}
#window #arena.mobile:not(.chess) .player[data-position='0']>.framebg{
/*display: none;*/
@ -2605,12 +2605,12 @@ div:not(.handcards)>.card>.info>span,
left: -20%;
top: -20%;*/
background-size: 120%;
background-position: -4px -4px;
background-repeat: no-repeat;
background-position: -4px -4px;
background-repeat: no-repeat;
}
#arena:not(.chess) .player[data-position='0']>.equips>div>.image{
background-size: 115%;
background-size: 115%;
}
/*.equips>div:hover>.info{display: inline-block;
animation:equip_hover 1s;
@ -4316,9 +4316,9 @@ div[data-decoration="bronze"]::after{
}
.card.fullskin.gold>.name {
color: white;
text-shadow: black 0 0 1px, rgba(0,0,0,0.5) 0 0 1px;
text-shadow: black 0 0 1px, rgba(0,0,0,0.5) 0 0 1px;
background: rgba(234, 158, 0, 0.6);
border: 1px solid rgb(134, 87, 1);
border: 1px solid rgb(134, 87, 1);
box-shadow: rgba(255, 149, 0, 0.4) 0 0 10px inset;
}
.card.fullskin.gold>.name2 {
@ -4428,9 +4428,9 @@ div[data-decoration="bronze"]::after{
background-color: red;
}
/* #arena>.skillbar.full { */
/*transform: scale(1.1);*/
/*box-shadow: rgba(0, 0, 0, 0.1) 0 0 0 1px, rgba(0, 0, 0, 0.45) 0 3px 10px;
-webkit-animation:skillbarglow 3s infinite;*/
/*transform: scale(1.1);*/
/*box-shadow: rgba(0, 0, 0, 0.1) 0 0 0 1px, rgba(0, 0, 0, 0.45) 0 3px 10px;
-webkit-animation:skillbarglow 3s infinite;*/
/* } */
#arena>.skillbar>.skillbartext {
font-family: 'xinwei';
@ -4755,9 +4755,9 @@ div[data-decoration="bronze"]::after{
}
.dice{
position: absolute;
width: 200px;
height: 200px;
transform-style: preserve-3d;
width: 200px;
height: 200px;
transform-style: preserve-3d;
left: calc(50% - 100px);
top: calc(50% - 100px);
transition: transform 2s ease;
@ -4800,92 +4800,92 @@ div[data-decoration="bronze"]::after{
}
.dice>div{
position: absolute;
width: 200px;
height: 200px;
background: #fff;
box-shadow:inset 0 0 40px #ccc;
border-radius: 40px;
width: 200px;
height: 200px;
background: #fff;
box-shadow:inset 0 0 40px #ccc;
border-radius: 40px;
}
.dice .cover, .dice .inner {
background: #e0e0e0;
box-shadow: none;
background: #e0e0e0;
box-shadow: none;
}
.dice .cover {
border-radius: 0;
transform: translateZ(0px);
border-radius: 0;
transform: translateZ(0px);
}
.dice .cover.x {
transform: rotateY(90deg);
transform: rotateY(90deg);
}
.dice .cover.z {
transform: rotateX(90deg);
transform: rotateX(90deg);
}
.dice .front {
transform: translateZ(100px);
transform: translateZ(100px);
}
.dice .front.inner {
transform: translateZ(98px);
transform: translateZ(98px);
}
.dice .back {
transform: rotateX(-180deg) translateZ(100px);
transform: rotateX(-180deg) translateZ(100px);
}
.dice .back.inner {
transform: rotateX(-180deg) translateZ(98px);
transform: rotateX(-180deg) translateZ(98px);
}
.dice .right {
transform: rotateY(90deg) translateZ(100px);
transform: rotateY(90deg) translateZ(100px);
}
.dice .right.inner {
transform: rotateY(90deg) translateZ(98px);
transform: rotateY(90deg) translateZ(98px);
}
.dice .left {
transform: rotateY(-90deg) translateZ(100px);
transform: rotateY(-90deg) translateZ(100px);
}
.dice .left.inner {
transform: rotateY(-90deg) translateZ(98px);
transform: rotateY(-90deg) translateZ(98px);
}
.dice .top {
transform: rotateX(90deg) translateZ(100px);
transform: rotateX(90deg) translateZ(100px);
}
.dice .top.inner {
transform: rotateX(90deg) translateZ(98px);
transform: rotateX(90deg) translateZ(98px);
}
.dice .bottom {
transform: rotateX(-90deg) translateZ(100px);
transform: rotateX(-90deg) translateZ(100px);
}
.dice .bottom.inner {
transform: rotateX(-90deg) translateZ(98px);
transform: rotateX(-90deg) translateZ(98px);
}
.dice .dot {
position:absolute;
width:46px;
height:46px;
border-radius:23px;
background:#444;
box-shadow:inset 5px 0 10px #000;
position:absolute;
width:46px;
height:46px;
border-radius:23px;
background:#444;
box-shadow:inset 5px 0 10px #000;
}
.dice .dot.center {
margin:77px 0 0 77px;
margin:77px 0 0 77px;
}
.dice .dot.dtop {
margin-top:20px;
margin-top:20px;
}
.dice .dot.dleft {
margin-left:134px;
margin-left:134px;
}
.dice .dot.dright {
margin-left:20px;
margin-left:20px;
}
.dice .dot.dbottom {
margin-top:134px;
margin-top:134px;
}
.dice .dot.center.dleft {
margin:77px 0 0 20px;
margin:77px 0 0 20px;
}
.dice .dot.center.dright {
margin:77px 0 0 134px;
margin:77px 0 0 134px;
}
#window.dicepaused>#arena,
@ -5463,6 +5463,19 @@ div[data-decoration="bronze"]::after{
transform: perspective(1000px) rotateY(360deg);
}
}
@keyframes background-position-left-center-right-center-left-center {
0% {
background-position: left center;
}
50% {
background-position: right center;
}
100% {
background-position: left center;
}
}
/*--------其它--------*/
::-webkit-scrollbar {
display: none;

81
layout/default/menu.css
View File

@ -304,6 +304,46 @@
margin-right: 10px;
}
.menubg.charactercard .characterintro .character-group img,
.menubg.charactercard .characterintro .character-sex img {
height: 1em;
margin-left: 0.25em;
margin-right: 0.25em;
transform: scale(1.5);
vertical-align: bottom;
}
.menubg.charactercard .characterintro .character-intro-table {
align-items: center;
display: flex;
flex-wrap: wrap;
padding-left: 0.5em;
padding-right: 0.5em;
white-space: nowrap;
}
@supports (row-gap: 0.5em) {
.menubg.charactercard .characterintro .character-intro-table {
column-gap: 1em;
row-gap: 0.5em;
}
}
@supports not (row-gap: 0.5em) {
.menubg.charactercard .characterintro .character-intro-table>:last-child {
margin-bottom: 0.5em;
margin-top: 0.5em;
}
.menubg.charactercard .characterintro .character-intro-table>:not(:first-child) {
margin-left: 0.5em;
}
.menubg.charactercard .characterintro .character-intro-table>:not(:last-child) {
margin-right: 0.5em;
}
}
.menubg.charactercard .characterintro .hp {
height: initial;
left: initial;
@ -324,48 +364,23 @@
background: none !important;
border: none !important;
box-shadow: none !important;
filter: initial;
-webkit-filter: initial;
height: initial;
width: initial;
filter: initial !important;
-webkit-filter: initial !important;
font-family: 'xinwei' !important;
transform: initial !important;
height: initial !important;
width: initial !important;
}
.menubg.charactercard .characterintro div,
.menubg.charactercard .characterintro.intro2 div {
.menubg.charactercard .characterintro div {
position: initial;
}
.menubg.charactercard .characterintro rp,
.menubg.charactercard .characterintro rt,
.menubg.charactercard .characterintro.intro2 rp,
.menubg.charactercard .characterintro.intro2 rt {
.menubg.charactercard .characterintro rt {
font-size: smaller;
}
.menubg.charactercard .characterintro table td img {
height: 1.5em;
vertical-align: middle;
}
.menubg.charactercard .characterintro table td {
white-space: nowrap;
}
.menubg.charactercard .characterintro table td:first-child {
width: 25%;
}
.menubg.charactercard .characterintro table td:not(:first-child) {
text-align: center;
}
.menubg.charactercard .characterintro table {
border-collapse: collapse;
border-color: currentColor;
table-layout: auto;
width: 100%;
}
.menubg.charactercard .characterintro {
left: 200px;
width: 280px;