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
commit 3a78039ec8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 1127 additions and 1177 deletions

View File

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

View File

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

View File

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

View File

@ -90,7 +90,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
cenhun:['male','wu',4,['jishe','lianhuo']], cenhun:['male','wu',4,['jishe','lianhuo']],
huanghao:['male','shu',3,['qinqing','huisheng']], 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']], sunziliufang:['male','wei',3,['guizao','jiyu']],
xinxianying:['female','wei',3,['zhongjian','caishi']], xinxianying:['female','wei',3,['zhongjian','caishi']],

File diff suppressed because it is too large Load Diff

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.9 KiB

BIN
image/card/sex_double.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

BIN
image/card/sex_female.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.5 KiB

BIN
image/card/sex_male.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.2 KiB

BIN
image/card/sex_none.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.1 KiB

BIN
image/card/sex_unknown.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

View File

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

View File

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

View File

@ -304,6 +304,46 @@
margin-right: 10px; 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 { .menubg.charactercard .characterintro .hp {
height: initial; height: initial;
left: initial; left: initial;
@ -324,48 +364,23 @@
background: none !important; background: none !important;
border: none !important; border: none !important;
box-shadow: none !important; box-shadow: none !important;
filter: initial; filter: initial !important;
-webkit-filter: initial; -webkit-filter: initial !important;
height: initial; font-family: 'xinwei' !important;
width: initial; transform: initial !important;
height: initial !important;
width: initial !important;
} }
.menubg.charactercard .characterintro div, .menubg.charactercard .characterintro div {
.menubg.charactercard .characterintro.intro2 div {
position: initial; position: initial;
} }
.menubg.charactercard .characterintro rp, .menubg.charactercard .characterintro rp,
.menubg.charactercard .characterintro rt, .menubg.charactercard .characterintro rt {
.menubg.charactercard .characterintro.intro2 rp,
.menubg.charactercard .characterintro.intro2 rt {
font-size: smaller; 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 { .menubg.charactercard .characterintro {
left: 200px; left: 200px;
width: 280px; width: 280px;